Skip to content

Commit 4a2ee9b

Browse files
sergejshaSergej Shafarenka
andauthored
Bump libs (#58)
* Add w(TAG, throwable) method for logging exceptions as warnings w/o a message * Remove broken demo apps * Bump libs and fix tests * Add change log --------- Co-authored-by: Sergej Shafarenka <sergej.shafarenka@halfbit.de>
1 parent 01612db commit 4a2ee9b

File tree

67 files changed

+2966
-2099
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2966
-2099
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Change log
22

3+
## 0.9
4+
5+
- Update to Kotlin 2.2.0
6+
- Bump libraries
7+
38
## 0.8
49

510
- Update to Kotlin 2.1.0

build-plugins/settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pluginManagement {
77
}
88

99
dependencyResolutionManagement {
10+
@Suppress("UnstableApiUsage")
1011
repositories {
1112
google()
1213
gradlePluginPortal()

build.gradle.kts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
plugins {
2-
// library
32
id("root.publication")
4-
alias(libs.plugins.android.library).apply(false)
5-
alias(libs.plugins.kotlin.multiplatform).apply(false)
6-
alias(libs.plugins.kotlinx.atomicfu).apply(false)
7-
// sample apps
8-
alias(libs.plugins.android.application).apply(false)
9-
alias(libs.plugins.kotlin.compose).apply(false)
10-
alias(libs.plugins.jetbrains.compose).apply(false)
3+
alias(libs.plugins.android.library) apply false
4+
alias(libs.plugins.kotlin.multiplatform) apply false
5+
alias(libs.plugins.kotlinx.atomicfu) apply false
116
}

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#Gradle
2-
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
2+
org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4096M"
33
# Cache disabled because publishing to maven fails otherwise
44
org.gradle.caching=false
55
org.gradle.configuration-cache=false
66
#Kotlin
77
kotlin.code.style=official
8-
kotlin.js.compiler=ir
98
#MPP
109
kotlin.mpp.enableCInteropCommonization=true
1110
#Android

gradle/libs.versions.toml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,20 @@
11
[versions]
2-
agp = "8.7.3"
3-
kotlin = "2.1.20"
2+
agp = "8.11.0"
3+
kotlin = "2.2.0"
44

55
android-minSdk = "24"
6-
android-compileSdk = "34"
6+
android-compileSdk = "36"
77

8-
kotlinx-datetime = "0.6.2"
9-
kotlinx-atomicfu = "0.27.0"
10-
11-
# sample apps
12-
compose-plugin = "1.7.0-alpha03"
13-
activity-compose = "1.9.3"
14-
android-targetSdk = "34"
8+
kotlinx-datetime = "0.7.1"
9+
kotlinx-atomicfu = "0.29.0"
1510

1611
[libraries]
1712
# logger
1813
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
19-
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
2014
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
2115
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinx-atomicfu" }
2216

23-
# sample apps
24-
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
25-
2617
[plugins]
2718
android-library = { id = "com.android.library", version.ref = "agp" }
2819
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
2920
kotlinx-atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "kotlinx-atomicfu" }
30-
# logger
31-
android-application = { id = "com.android.application", version.ref = "agp" }
32-
jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
33-
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)