Skip to content

Commit 2855d28

Browse files
authored
Getting plugin to work with jdk 16
Updating Gradle to version 7 Upgrading kotlin plugin to 1.4.30 Upgrading asm dependency in a hacky way to 9.2 to support jdk 16 Fixing tests that were unfixed by previous code changes.
2 parents 57718fc + 2047db8 commit 2855d28

File tree

5 files changed

+884
-870
lines changed

5 files changed

+884
-870
lines changed

build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
kotlin("jvm") version Versions.kotlin
33
`kotlin-dsl`
44
`java-gradle-plugin`
5-
`maven-publish`
65
id("com.gradle.plugin-publish") version "0.14.0"
76
}
87

@@ -24,7 +23,10 @@ dependencies {
2423
implementation(kotlin("stdlib"))
2524
implementation(kotlin("stdlib-jdk8"))
2625

27-
implementation("org.apache.maven.shared:maven-dependency-analyzer:1.11.2")
26+
implementation("org.apache.maven.shared:maven-dependency-analyzer:1.11.3")
27+
// maven-dependency-analyzer:1.11.3 depends on an earlier version of asm which doesn't support jdk 16
28+
// Depending on asm:9.2 directly resolves this.
29+
implementation("org.ow2.asm:asm:9.2")
2830

2931
testImplementation("junit:junit:4.12")
3032
testImplementation("org.assertj:assertj-core:3.9.1")

buildSrc/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
`kotlin-dsl`
2+
`kotlin-dsl`
33
}
44

55
repositories {
6-
mavenCentral()
6+
mavenCentral()
77
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@file:Suppress("InvalidPackageDeclaration")
22

33
object Versions {
4-
val kotlin = "1.4.10"
4+
val kotlin = "1.4.30"
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)