Merge pull request #238 from tarkalabs/younes/KotlinVersionUpdates

Updating Kotlin and Compose Versions
tarkalabs · May 16, 2024 · 939d61c · 939d61c
2 parents 7a34948 + 35b50ae
commit 939d61c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,9 +7,9 @@ buildscript {
 plugins {
   id("com.android.application") version "7.4.2" apply false
   id("com.android.library") version "7.4.2" apply false
-  id("org.jetbrains.kotlin.android") version "1.8.10" apply false
+  id("org.jetbrains.kotlin.android") version "1.9.23" apply false
   id("com.vanniktech.maven.publish") version "0.27.0"
-  id("org.jetbrains.dokka") version  "1.8.10" apply false
+  id("org.jetbrains.dokka") version  "1.9.20" apply false
 }
 
 subprojects {

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -28,17 +28,17 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
   buildFeatures {
     compose =  true
   }
   composeOptions {
-    kotlinCompilerExtensionVersion = "1.4.3"
+    kotlinCompilerExtensionVersion = "1.5.11"
   }
   packagingOptions {
     resources {
@@ -48,9 +48,8 @@ android {
 }
 
 dependencies {
-  val composeUiVersion = "1.4.0"
+  val composeUiVersion = "1.4.1"
   implementation(project(":tarka-ui"))
-  implementation(project(":tarka-ui-icons"))
   implementation("androidx.core:core-ktx:1.10.0")
   implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
   implementation("androidx.activity:activity-compose:1.7.1")

diff --git a/tarka-ui-icons/build.gradle.kts b/tarka-ui-icons/build.gradle.kts
@@ -26,18 +26,18 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 
   buildFeatures {
     compose = true
   }
   composeOptions {
-    kotlinCompilerExtensionVersion = "1.4.3"
+    kotlinCompilerExtensionVersion = "1.5.11"
   }
 }
 
@@ -48,7 +48,7 @@ publishing {
       run {
         groupId = "com.tarkalabs"
         artifactId = "tarkaui-icons"
-        version = "1.0.2"
+        version = "1.0.3"
         artifact("$buildDir/outputs/aar/tarka-ui-icons-release.aar")
       }
     }

diff --git a/tarka-ui/build.gradle.kts b/tarka-ui/build.gradle.kts
@@ -29,17 +29,17 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
   buildFeatures {
     compose = true
   }
   composeOptions {
-    kotlinCompilerExtensionVersion = "1.4.3"
+    kotlinCompilerExtensionVersion = "1.5.11"
   }
   packagingOptions {
     resources {
@@ -66,7 +66,7 @@ publishing {
       run {
         groupId = "com.tarkalabs"
         artifactId = getLibraryArtifactId()
-        version = "1.1.20"
+        version = "1.1.21"
         artifact("$buildDir/outputs/aar/tarka-ui-release.aar")
       }
     }
@@ -92,7 +92,7 @@ dependencies {
   implementation("androidx.compose.ui:ui-tooling-preview:$composeUiVersion")
   implementation("androidx.compose.material3:material3:1.2.0")
   implementation("androidx.compose.foundation:foundation:$composeUiVersion")
-  api("com.tarkalabs:tarkaui-icons:1.0.2")
+  api(project(":tarka-ui-icons"))
   implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7")
   testImplementation("junit:junit:4.13.2")
   androidTestImplementation("androidx.test.ext:junit:1.1.5")