Skip to content

Commit 24c5589

Browse files
hopeman15hopeman15
authored
Merge branch 'main' into renovate/org.jetbrains.kotlinx.kover-0.x
2 parents cffb3be + 5c4f54b commit 24c5589

8 files changed

Lines changed: 50 additions & 69 deletions

File tree

‎.github/renovate.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:base"
4+
"config:recommended"
55
],
66
"labels": [
77
"dependencies"
88
],
99
"packageRules": [
1010
{
11-
"matchPackagePatterns": [
12-
"com.android.library",
13-
"com.android.application"
14-
],
15-
"groupName": "Android Gradle Plugin"
11+
"groupName": "Android Gradle Plugin",
12+
"matchPackageNames": [
13+
"/com.android.library/",
14+
"/com.android.application/"
15+
]
1616
},
1717
{
18-
"matchPackagePatterns": [
19-
"androidx.compose.*"
20-
],
21-
"groupName": "Compose"
18+
"groupName": "Compose",
19+
"matchPackageNames": [
20+
"/androidx.compose.*/"
21+
]
2222
},
2323
{
24-
"matchPackagePatterns": [
25-
"composeOptions",
26-
"org.jetbrains.kotlin.android",
27-
"org.jetbrains.kotlin:kotlin-stdlib*",
28-
"org.jetbrains.kotlin.plugin.*"
29-
],
30-
"groupName": "Kotlin & Compose Compiler"
24+
"groupName": "Kotlin & Compose Compiler",
25+
"matchPackageNames": [
26+
"/composeOptions/",
27+
"/org.jetbrains.kotlin.android/",
28+
"/org.jetbrains.kotlin:kotlin-stdlib*/",
29+
"/org.jetbrains.kotlin.plugin.*/"
30+
]
3131
},
3232
{
33-
"matchPackagePatterns": [
34-
"io.ktor:*"
35-
],
36-
"groupName": "Ktor"
33+
"groupName": "Ktor",
34+
"matchPackageNames": [
35+
"/io.ktor:*/"
36+
]
3737
},
3838
{
39-
"matchPackagePatterns": [
40-
"androidx.navigation.*"
41-
],
42-
"groupName": "Navigation"
39+
"groupName": "Navigation",
40+
"matchPackageNames": [
41+
"/androidx.navigation.*/"
42+
]
4343
}
4444
]
4545
}

‎app/build.gradle.kts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import com.github.triplet.gradle.androidpublisher.ResolutionStrategy
44
plugins {
55
id("com.android.application")
66
id("org.jetbrains.kotlin.android")
7+
id("org.jetbrains.kotlin.plugin.compose")
78
id("com.github.triplet.play") version "3.11.0"
89
}
910

1011
android {
1112
namespace = "com.hello.curiosity"
12-
compileSdk = 34
13-
buildToolsVersion = "34.0.0"
13+
compileSdk = 35
1414

1515
defaultConfig {
1616
applicationId = "com.hello.curiosity.design"
1717
minSdk = 23
18-
targetSdk = 34
18+
targetSdk = 35
1919

2020
versionCode = System.getenv("GITHUB_RUN_NUMBER")?.toInt() ?: 1
2121
versionName = System.getenv("VERSION") ?: "local"
@@ -75,10 +75,6 @@ android {
7575
compose = true
7676
}
7777

78-
composeOptions {
79-
kotlinCompilerExtensionVersion = "1.5.11"
80-
}
81-
8278
packaging {
8379
resources {
8480
excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -95,7 +91,7 @@ android {
9591

9692
dependencies {
9793
// Android
98-
implementation("androidx.core:core-ktx:1.13.1")
94+
implementation("androidx.core:core-ktx:1.15.0")
9995

10096
// Compose
10197
implementation("androidx.activity:activity-compose:1.9.3")

‎build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ buildscript {
88
plugins {
99
id("com.android.application") version "8.7.2" apply false
1010
id("com.android.library") version "8.7.2" apply false
11-
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
11+
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
12+
id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
1213

1314
id("io.gitlab.arturbosch.detekt") version "1.23.7"
1415
id("org.jmailen.kotlinter") version "3.16.0"

‎curiosity/build.gradle.kts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("com.android.library")
33
id("org.jetbrains.kotlin.android")
4+
id("org.jetbrains.kotlin.plugin.compose")
45

56
// Publishing
67
id("maven-publish")
@@ -9,7 +10,7 @@ plugins {
910

1011
android {
1112
namespace = "io.github.hellocuriosity.compose"
12-
compileSdk = 34
13+
compileSdk = 35
1314
buildToolsVersion = "34.0.0"
1415

1516
defaultConfig {
@@ -39,10 +40,6 @@ android {
3940
compose = true
4041
}
4142

42-
composeOptions {
43-
kotlinCompilerExtensionVersion = "1.5.11"
44-
}
45-
4643
publishing {
4744
singleVariant("release") {
4845
withSourcesJar()
@@ -60,7 +57,7 @@ android {
6057

6158
dependencies {
6259
// Android
63-
implementation("androidx.core:core-ktx:1.13.1")
60+
implementation("androidx.core:core-ktx:1.15.0")
6461

6562
// Compose
6663
implementation("androidx.activity:activity-compose:1.9.3")

‎navigation/build.gradle.kts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("com.android.library")
33
id("org.jetbrains.kotlin.android")
4+
id("org.jetbrains.kotlin.plugin.compose")
45

56
// Publishing
67
id("maven-publish")
@@ -9,7 +10,7 @@ plugins {
910

1011
android {
1112
namespace = "io.github.hellocuriosity.compose.navigation"
12-
compileSdk = 34
13+
compileSdk = 35
1314
buildToolsVersion = "34.0.0"
1415

1516
defaultConfig {
@@ -38,10 +39,6 @@ android {
3839
compose = true
3940
}
4041

41-
composeOptions {
42-
kotlinCompilerExtensionVersion = "1.5.11"
43-
}
44-
4542
publishing {
4643
singleVariant("release") {
4744
withSourcesJar()
@@ -59,7 +56,7 @@ android {
5956

6057
dependencies {
6158
// Android
62-
implementation("androidx.core:core-ktx:1.13.1")
59+
implementation("androidx.core:core-ktx:1.15.0")
6360

6461
// Compose
6562
implementation("androidx.activity:activity-compose:1.9.3")

‎settings/build.gradle.kts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("com.android.library")
33
id("org.jetbrains.kotlin.android")
4+
id("org.jetbrains.kotlin.plugin.compose")
45

56
// Publishing
67
id("maven-publish")
@@ -9,12 +10,10 @@ plugins {
910

1011
android {
1112
namespace = "io.github.hellocuriosity.compose.settings"
12-
compileSdk = 34
13-
buildToolsVersion = "34.0.0"
13+
compileSdk = 35
1414

1515
defaultConfig {
1616
minSdk = 23
17-
targetSdk = 34
1817

1918
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2019
consumerProguardFiles("consumer-rules.pro")
@@ -39,10 +38,6 @@ android {
3938
compose = true
4039
}
4140

42-
composeOptions {
43-
kotlinCompilerExtensionVersion = "1.5.11"
44-
}
45-
4641
publishing {
4742
singleVariant("release") {
4843
withSourcesJar()
@@ -60,7 +55,7 @@ android {
6055

6156
dependencies {
6257
// Android
63-
implementation("androidx.core:core-ktx:1.13.1")
58+
implementation("androidx.core:core-ktx:1.15.0")
6459

6560
// Compose
6661
implementation("androidx.activity:activity-compose:1.9.3")

‎slack-feedback/build.gradle.kts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("java-library")
33
id("org.jetbrains.kotlin.jvm")
4-
kotlin("plugin.serialization") version "1.9.23"
4+
kotlin("plugin.serialization") version "2.0.21"
55

66
// Publishing
77
id("maven-publish")
@@ -15,13 +15,13 @@ java {
1515

1616
dependencies {
1717
// Ktor
18-
implementation("io.ktor:ktor-client-content-negotiation:2.3.12")
19-
implementation("io.ktor:ktor-client-core:2.3.12")
20-
implementation("io.ktor:ktor-client-okhttp:2.3.12")
21-
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.12")
18+
implementation("io.ktor:ktor-client-content-negotiation:3.0.1")
19+
implementation("io.ktor:ktor-client-core:3.0.1")
20+
implementation("io.ktor:ktor-client-okhttp:3.0.1")
21+
implementation("io.ktor:ktor-serialization-kotlinx-json:3.0.1")
2222

2323
// Serialization
24-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
24+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
2525

2626
// Testing
2727
testImplementation("junit:junit:4.13.2")
@@ -33,7 +33,7 @@ dependencies {
3333
testImplementation("io.mockk:mockk:1.13.13")
3434

3535
// Ktor
36-
testImplementation("io.ktor:ktor-client-mock:2.3.12")
36+
testImplementation("io.ktor:ktor-client-mock:3.0.1")
3737
testImplementation("org.slf4j:slf4j-simple:2.0.16")
3838
}
3939

‎test-compose-utils/build.gradle.kts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("com.android.library")
33
id("org.jetbrains.kotlin.android")
4+
id("org.jetbrains.kotlin.plugin.compose")
45

56
// Publishing
67
id("maven-publish")
@@ -9,12 +10,10 @@ plugins {
910

1011
android {
1112
namespace = "io.github.hellocuriosity.test.compose"
12-
compileSdk = 34
13-
buildToolsVersion = "34.0.0"
13+
compileSdk = 35
1414

1515
defaultConfig {
1616
minSdk = 23
17-
targetSdk = 34
1817

1918
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2019
}
@@ -38,10 +37,6 @@ android {
3837
compose = true
3938
}
4039

41-
composeOptions {
42-
kotlinCompilerExtensionVersion = "1.5.11"
43-
}
44-
4540
publishing {
4641
singleVariant("release") {
4742
withSourcesJar()
@@ -52,7 +47,7 @@ android {
5247

5348
dependencies {
5449
// Android
55-
implementation("androidx.core:core-ktx:1.13.1")
50+
implementation("androidx.core:core-ktx:1.15.0")
5651

5752
// Compose
5853
implementation("androidx.navigation:navigation-compose:2.8.3")

0 commit comments

Comments
 (0)