Skip to content

Commit

Permalink
Upgradle to Kotlin 1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cosic committed Jan 7, 2023
1 parent 59895e4 commit 1f30940
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:" + libs.versions.androidgp.get())
classpath("com.android.tools.build:gradle:" + libs.versions.androidGradlePlugin.get())
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ targetSdkVersion = "33"
minSdkVersion = "21"
buildToolsVersion = "33.0.0"

kotlin = "1.7.20"
kotlin = "1.8.0"
junitJupiter = "5.7.0"
androidgp = "7.3.0"
androidGradlePlugin = "7.3.1"
sampleHuaweiPlugin = "1.3.5-SNAPSHOT"

[libraries]
Expand All @@ -20,7 +20,7 @@ kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect:1.7.20"
gson = "com.google.code.gson:gson:2.8.6"
okHttp = "com.squareup.okhttp3:okhttp:4.9.1"
androidgp = { group = "com.android.tools.build", name = "gradle", version.ref = "androidgp" }
androidGradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }

test-assertk = "com.willowtreeapps.assertk:assertk-jvm:0.23"
test-hamcreast = "org.hamcrest:hamcrest:2.1"
Expand Down
5 changes: 2 additions & 3 deletions plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins {
alias(libs.plugins.bintray)
alias(libs.plugins.dokka)
alias(libs.plugins.kotlinJvm)
alias(libs.plugins.benManesVersions)
}

apply(from = "$projectDir/config/maven-publish.gradle")
Expand Down Expand Up @@ -92,7 +91,7 @@ dependencies {
implementation(libs.kotlinReflect)
implementation(libs.gson)
implementation(libs.okHttp)
compileOnly(libs.androidgp)
compileOnly(libs.androidGradlePlugin)

testImplementation(libs.test.junitJupiterApi)
testImplementation(libs.test.junitJupiterEngine)
Expand All @@ -102,5 +101,5 @@ dependencies {
testImplementation(libs.test.mockitoKotlin)
testImplementation(libs.test.hamcreast)
testImplementation(libs.test.assertk)
testImplementation(libs.androidgp)
testImplementation(libs.androidGradlePlugin)
}

0 comments on commit 1f30940

Please sign in to comment.