Skip to content

Commit

Permalink
Update kotlin to 1.9.0 (#61)
Browse files Browse the repository at this point in the history
* Update kotlin to 1.9.0

* Update Agp to 8.1.0

* Update benchmark to 0.4.9

* Update yarn.lock

* Downgrade jmh to 1.23
  • Loading branch information
robxyy authored Aug 10, 2023
1 parent 59fa3eb commit 9bf1e7f
Show file tree
Hide file tree
Showing 5 changed files with 272 additions and 534 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ allprojects {
}

subprojects {
fun CommonExtension<*, *, *, *>.applyAndroid() {
fun CommonExtension<*, *, *, *, *>.applyAndroid() {
lint {
textReport = true
textOutput = file("stdout")
Expand Down
2 changes: 1 addition & 1 deletion encoding/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

kotlin {
android {
androidTarget {
publishLibraryVariants("release")
}
jvm()
Expand Down
6 changes: 0 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
# Gradle
org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8

# Kotlin
kotlin.mpp.stability.nowarn=true
kotlin.mpp.enableCompatibilityMetadataVariant=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.mpp.androidGradlePluginCompatibility.nowarn=true

# Android
android.useAndroidX=true
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
kotlin = "1.8.22"
benchmark = "0.4.8"
kotlin = "1.9.0"
benchmark = "0.4.9"

[libraries]
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
Expand All @@ -10,7 +10,7 @@ dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", vers
mavenPublish-gradle-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.25.3" }
benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "benchmark" }
benchmark-gradle-plugin = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-plugin", version.ref = "benchmark" }
jmh-core = { module = "org.openjdk.jmh:jmh-core", version = "1.37" }
android-gradle-plugin = { module = "com.android.tools.build:gradle", version = "8.0.2" }
jmh-core = { module = "org.openjdk.jmh:jmh-core", version = "1.23" }
android-gradle-plugin = { module = "com.android.tools.build:gradle", version = "8.1.0" }
androidx-test-runner = { module = "androidx.test:runner", version = "1.5.2" }
junit = { module = "junit:junit", version = "4.13.2" }
Loading

0 comments on commit 9bf1e7f

Please sign in to comment.