Merge branch 'main' into renovate/org.jetbrains.kotlinx.kover-0.x

HelloCuriosity · Nov 1, 2024 · 24c5589 · 24c5589
2 parents cffb3be + 5c4f54b
commit 24c5589
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 69 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,45 +1,45 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
+    "config:recommended"
   ],
   "labels": [
     "dependencies"
   ],
   "packageRules": [
     {
-      "matchPackagePatterns": [
-        "com.android.library",
-        "com.android.application"
-      ],
-      "groupName": "Android Gradle Plugin"
+      "groupName": "Android Gradle Plugin",
+      "matchPackageNames": [
+        "/com.android.library/",
+        "/com.android.application/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "androidx.compose.*"
-      ],
-      "groupName": "Compose"
+      "groupName": "Compose",
+      "matchPackageNames": [
+        "/androidx.compose.*/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "composeOptions",
-        "org.jetbrains.kotlin.android",
-        "org.jetbrains.kotlin:kotlin-stdlib*",
-        "org.jetbrains.kotlin.plugin.*"
-      ],
-      "groupName": "Kotlin & Compose Compiler"
+      "groupName": "Kotlin & Compose Compiler",
+      "matchPackageNames": [
+        "/composeOptions/",
+        "/org.jetbrains.kotlin.android/",
+        "/org.jetbrains.kotlin:kotlin-stdlib*/",
+        "/org.jetbrains.kotlin.plugin.*/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "io.ktor:*"
-      ],
-      "groupName": "Ktor"
+      "groupName": "Ktor",
+      "matchPackageNames": [
+        "/io.ktor:*/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "androidx.navigation.*"
-      ],
-      "groupName": "Navigation"
+      "groupName": "Navigation",
+      "matchPackageNames": [
+        "/androidx.navigation.*/"
+      ]
     }
   ]
 }
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -4,18 +4,18 @@ import com.github.triplet.gradle.androidpublisher.ResolutionStrategy
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("com.github.triplet.play") version "3.11.0"
 }
 
 android {
     namespace = "com.hello.curiosity"
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.hello.curiosity.design"
         minSdk = 23
-        targetSdk = 34
+        targetSdk = 35
 
         versionCode = System.getenv("GITHUB_RUN_NUMBER")?.toInt() ?: 1
         versionName = System.getenv("VERSION") ?: "local"
@@ -75,10 +75,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
-    }
-
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -95,7 +91,7 @@ android {
 
 dependencies {
     // Android
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-ktx:1.15.0")
 
     // Compose
     implementation("androidx.activity:activity-compose:1.9.3")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,8 @@ buildscript {
 plugins {
     id("com.android.application") version "8.7.2" apply false
     id("com.android.library") version "8.7.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.23" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.21" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
 
     id("io.gitlab.arturbosch.detekt") version "1.23.7"
     id("org.jmailen.kotlinter") version "3.16.0"

diff --git a/curiosity/build.gradle.kts b/curiosity/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
 
     // Publishing
     id("maven-publish")
@@ -9,7 +10,7 @@ plugins {
 
 android {
     namespace = "io.github.hellocuriosity.compose"
-    compileSdk = 34
+    compileSdk = 35
     buildToolsVersion = "34.0.0"
 
     defaultConfig {
@@ -39,10 +40,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
-    }
-
     publishing {
         singleVariant("release") {
             withSourcesJar()
@@ -60,7 +57,7 @@ android {
 
 dependencies {
     // Android
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-ktx:1.15.0")
 
     // Compose
     implementation("androidx.activity:activity-compose:1.9.3")

diff --git a/navigation/build.gradle.kts b/navigation/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
 
     // Publishing
     id("maven-publish")
@@ -9,7 +10,7 @@ plugins {
 
 android {
     namespace = "io.github.hellocuriosity.compose.navigation"
-    compileSdk = 34
+    compileSdk = 35
     buildToolsVersion = "34.0.0"
 
     defaultConfig {
@@ -38,10 +39,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
-    }
-
     publishing {
         singleVariant("release") {
             withSourcesJar()
@@ -59,7 +56,7 @@ android {
 
 dependencies {
     // Android
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-ktx:1.15.0")
 
     // Compose
     implementation("androidx.activity:activity-compose:1.9.3")

diff --git a/settings/build.gradle.kts b/settings/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
 
     // Publishing
     id("maven-publish")
@@ -9,12 +10,10 @@ plugins {
 
 android {
     namespace = "io.github.hellocuriosity.compose.settings"
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 23
-        targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -39,10 +38,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
-    }
-
     publishing {
         singleVariant("release") {
             withSourcesJar()
@@ -60,7 +55,7 @@ android {
 
 dependencies {
     // Android
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-ktx:1.15.0")
 
     // Compose
     implementation("androidx.activity:activity-compose:1.9.3")

diff --git a/slack-feedback/build.gradle.kts b/slack-feedback/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
-    kotlin("plugin.serialization") version "1.9.23"
+    kotlin("plugin.serialization") version "2.0.21"
 
     // Publishing
     id("maven-publish")
@@ -15,13 +15,13 @@ java {
 
 dependencies {
     // Ktor
-    implementation("io.ktor:ktor-client-content-negotiation:2.3.12")
-    implementation("io.ktor:ktor-client-core:2.3.12")
-    implementation("io.ktor:ktor-client-okhttp:2.3.12")
-    implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.12")
+    implementation("io.ktor:ktor-client-content-negotiation:3.0.1")
+    implementation("io.ktor:ktor-client-core:3.0.1")
+    implementation("io.ktor:ktor-client-okhttp:3.0.1")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:3.0.1")
 
     // Serialization
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
 
     // Testing
     testImplementation("junit:junit:4.13.2")
@@ -33,7 +33,7 @@ dependencies {
     testImplementation("io.mockk:mockk:1.13.13")
 
     // Ktor
-    testImplementation("io.ktor:ktor-client-mock:2.3.12")
+    testImplementation("io.ktor:ktor-client-mock:3.0.1")
     testImplementation("org.slf4j:slf4j-simple:2.0.16")
 }
 

diff --git a/test-compose-utils/build.gradle.kts b/test-compose-utils/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
 
     // Publishing
     id("maven-publish")
@@ -9,12 +10,10 @@ plugins {
 
 android {
     namespace = "io.github.hellocuriosity.test.compose"
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 23
-        targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -38,10 +37,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
-    }
-
     publishing {
         singleVariant("release") {
             withSourcesJar()
@@ -52,7 +47,7 @@ android {
 
 dependencies {
     // Android
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-ktx:1.15.0")
 
     // Compose
     implementation("androidx.navigation:navigation-compose:2.8.3")