Skip to content

Commit 6dc85ef

Browse files
committed
Update to Gradle 7.3
1 parent d1a4884 commit 6dc85ef

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

gradle-plugin/build.gradle

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
2-
id 'com.gradle.plugin-publish' version '0.15.0'
2+
id 'com.gradle.plugin-publish' version '0.18.0'
3+
id 'maven-publish'
4+
id 'java-gradle-plugin'
5+
id 'org.jetbrains.kotlin.jvm'
36
}
47

5-
apply plugin: "java-gradle-plugin"
6-
apply plugin: "org.jetbrains.kotlin.jvm"
7-
apply plugin: "maven"
88
apply from: rootProject.file('gradle/utils/embedded.gradle')
99

1010
pluginBundle {
@@ -26,10 +26,12 @@ pluginBundle {
2626
}
2727
}
2828

29-
install {
30-
repositories {
31-
mavenInstaller {
32-
pom.artifactId = 'kotlin-object-java-serialization'
29+
publishing {
30+
afterEvaluate {
31+
publications {
32+
withType(MavenPublication) {
33+
artifactId "kotlin-object-java-serialization"
34+
}
3335
}
3436
}
3537
}

gradle-plugin/src/main/kotlin/me/shika/ObjectSerializationPlugin.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package me.shika
22

33
import org.gradle.api.Project
4-
import org.gradle.api.internal.provider.DefaultListProperty
54
import org.gradle.api.provider.Provider
65
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
76
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin
@@ -21,7 +20,7 @@ class ObjectSerializationPlugin : KotlinCompilerPluginSupportPlugin {
2120
val project = kotlinCompilation.target.project
2221
val extension = project.extensions.findByType(ObjectSerializationExtension::class.java) ?: ObjectSerializationExtension()
2322

24-
return DefaultListProperty(SubpluginOption::class.java).apply {
23+
return project.objects.listProperty(SubpluginOption::class.java).apply {
2524
add(
2625
SubpluginOption(
2726
key = "enabled",

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Wed Dec 18 22:46:33 GMT 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
33
distributionBase=GRADLE_USER_HOME
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)