Updated README, Dependency & library version bump.

- Bumped Kotlin version to 1.9.23
- Bumped Compose version to 1.6.6
- Bumped Compose Compiler version to 1.5.12
- Bumped other dependencies version
- Bumped library version to v1.0.8

README.md

@@ -35,16 +35,37 @@
 ---
 
 ## Requirements
+<br/>
 
 ##### Base requirements:
 
 - Project `minSdk` version - `23`
 - Project `compileSdk` version - `34`
 
-##### Version `1.0.x`:
+<br/>
+
+##### Library version `1.0.0` - `1.0.3`:
+
+- Jetpack Compose - `1.4.x`
+
+<br/>
+
+##### Library version `1.0.4` - `1.0.6`:
 
 - Jetpack Compose - `1.5.x`
 
+<br/>
+
+##### Library version `1.0.7` onwards:
+
+- Jetpack Compose - `1.6.x`
+
+<br/>
+
+If you're using Compose BOM (e.g. 2024.04.01) and you're not sure which Compose library version is included, check out [this link](https://developer.android.com/develop/ui/compose/bom/bom-mapping) for a detailed BOM to library version mapping.
+
+<br/>
+
 ---
 
 ## Gradle Kotlin DSL Setup

app/build.gradle.kts

@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
@@ -35,7 +34,6 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 

build.gradle.kts

@@ -1,22 +1,5 @@
-buildscript {
-
-    repositories {
-        google()
-        mavenCentral()
-        maven(url = "https://jitpack.io")
-    }
-
-    dependencies {
-        classpath(libs.build.tools)
-        classpath(libs.kotlin.gradle.plugin)
-    }
-
-}
-
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.kotlinAndroid) apply false
-}
-true // Needed to make the Suppress annotation work for the plugins block
+}

gradle/libs.versions.toml

@@ -1,49 +1,43 @@
 [versions]
 
-agp = "8.2.2"
-kotlin = "1.9.22"
+# Plugins
+agp = "8.3.2"
+kotlin = "1.9.23"
 
-core-ktx = "1.12.0"
+# Core Dependencies
+core-ktx = "1.13.0"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.1.5"
 androidx-test-espresso-core = "3.5.1"
-
 androidx-appcompat-version = "1.6.1"
-
 lifecycle-runtime-ktx = "2.7.0"
 lifecycle-runtime-compose = "2.7.0"
 lifecycle-viewmodel-compose = "2.7.0"
+material = "1.11.0"
 
-activity-compose = "1.8.2"
+# Compose Dependencies
+activity-compose = "1.9.0"
 navigation-compose = "2.7.7"
+compose-compiler-version = "1.5.12"
+compose-version = "1.6.6"
+compose-m3-version = "1.2.1"
 
-compose-compiler-version = "1.5.9"
-compose-version = "1.6.1"
-compose-m3-version = "1.2.0"
 
-material = "1.11.0"
 
 [libraries]
 
-build-tools = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" }
-kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
 androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-test-espresso-core" }
-
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat-version" }
-
 lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
 lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle-runtime-compose" }
 lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle-viewmodel-compose" }
-
+material = { module = "com.google.android.material:material", version.ref = "material" }
 activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
 navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation-compose" }
 
-material = { module = "com.google.android.material:material", version.ref = "material" }
-
 compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "compose-version" }
 compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "compose-version" }
 compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose-version" }
@@ -54,10 +48,14 @@ compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-mani
 compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "compose-version" }
 compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "compose-m3-version" }
 
+
+
 [plugins]
 
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 
+
+
 [bundles]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun May 21 23:51:03 EEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -3,9 +3,10 @@ pluginManagement {
         google()
         mavenCentral()
         gradlePluginPortal()
-        maven(url = "https://jitpack.io")
     }
 }
+
+@Suppress("UnstableApiUsage")
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {

squircle-shape/build.gradle.kts

@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
@@ -27,7 +26,6 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
@@ -47,7 +45,7 @@ afterEvaluate {
 
                 groupId = "com.github.stoyan-vuchev"
                 artifactId = "squircle-shape"
-                version = "1.0.7"
+                version = "1.0.8"
 
                 afterEvaluate {
                     from(components["release"])