Update dependencies (especially kotlin to 2.0) (#22)

nedtwigg · web-flow · commit 68eb34cc7d59 · 2024-07-05T20:45:58.000-07:00
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -43,9 +43,11 @@ jobs:
         uses: gradle/gradle-build-action@v3
         with:
           gradle-home-cache-cleanup: true
-      - name: git fetch origin main
-        run: git fetch origin main
+      - run: git fetch origin main
       - name: publish all
         if: "${{ github.event.inputs.to_publish == 'all' }}"
         run: |
           ./gradlew :changelogPush -Prelease=true -Penable_publishing=true -Pgradle.publish.key=${{ secrets.GRADLE_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_SECRET }} --stacktrace --warning-mode all
+      - run: git checkout main
+      - run: git merge release
+      - run: git push origin main
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # AtPlug releases
 
 ## [Unreleased]
+### Changed
+- Bump all dependencies to latest, especially Kotlin to 2.0. ([#22](https://github.com/diffplug/atplug/pull/22))
 
 ## [1.1.0] - 2023-04-06
 ### Added
diff --git a/atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/gradle/PlugPluginTest.kt b/atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/gradle/PlugPluginTest.kt
@@ -14,15 +14,15 @@ class PlugPluginTest : GradleIntegrationHarness() {
 				.toContent(
 						"""
 						plugins {
-							id 'org.jetbrains.kotlin.jvm' version '1.8.0'
+							id 'org.jetbrains.kotlin.jvm' version '2.0.0'
 							id 'com.diffplug.atplug'
 						}
 						repositories {
 							mavenCentral()
 						}
 						dependencies {
 							implementation files("$runtimeJar")
-							implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
+							implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1"
 						}
 				"""
 								.trimIndent())
diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,11 @@ plugins {
 	id 'com.diffplug.spotless-changelog'
 }
 
+spotlessChangelog {
+	tagMessage '{{changes}}'
+	runAfterPush "gh release create release/{{version}} --title 'v{{version}}' --notes-from-tag"
+}
+
 repositories { mavenCentral() }
 
 group = 干.proj('maven_group', 'the maven group, recommend com.diffplug')
@@ -11,46 +16,39 @@ allprojects {
 }
 apply from: 干.file('base/sonatype.gradle')
 
-String VER_JUNIT_JUPITER = '5.9.2'
+String VER_JUNIT_JUPITER = '5.10.3'
 subprojects {
 	apply from: 干.file('base/java.gradle')
 	apply from: 干.file('base/kotlin.gradle')
-//	kotlin {
-//		sourceSets.all {
-//			languageSettings {
-//				languageVersion = "2.0"
-//			}
-//		}
-//	}
 	apply from: 干.file('spotless/java.gradle')
 	apply plugin: 'java-library'
 
 	repositories { mavenCentral() }
 
 	dependencies {
-		testImplementation "org.junit.jupiter:junit-jupiter-api:${VER_JUNIT_JUPITER}"
-		testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${VER_JUNIT_JUPITER}"
+		testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT_JUPITER}"
+		testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 	}
 	if (it.name == 'atplug-runtime') {
 		ext.maven_name = 'AtPlug runtime'
 		apply plugin: 'kotlinx-serialization'
 		dependencies {
-			implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
+			implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1"
 		}
 	} else if (it.name == 'atplug-test-harness') {
 		ext.maven_name='AtPlug test harness'
 		dependencies {
 			compileOnly "org.junit.jupiter:junit-jupiter-api:5.0.0"
-			implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.20"
+			implementation "org.jetbrains.kotlin:kotlin-reflect:2.0.0"
 			implementation project(':atplug-runtime')
 		}
 	} else if (it.name == 'atplug-plugin-gradle') {
 		ext.maven_name='AtPlug metadata generation Gradle plugin'
 		apply from: 干.file('base/gradle-plugin.gradle')
 		dependencies {
-			implementation "org.ow2.asm:asm:9.5"
-			implementation 'com.diffplug.gradle:goomph:3.41.0'
-			testImplementation 'org.assertj:assertj-core:3.24.2'
+			implementation "org.ow2.asm:asm:9.7"
+			implementation 'com.diffplug.gradle:goomph:4.0.1'
+			testImplementation 'org.assertj:assertj-core:3.26.0'
 		}
 		tasks.named('test') {
 			dependsOn ':atplug-runtime:jar', ':atplug-runtime:testClasses'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -6,31 +6,36 @@ pluginManagement {
 }
 plugins {
 	// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
-	id 'com.diffplug.blowdryerSetup' version '1.7.0'
+	id 'com.diffplug.blowdryerSetup' version '1.7.1'
 	// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
-	id 'com.diffplug.spotless' version '6.16.0' apply false
+	id 'com.diffplug.spotless' version '7.0.0.BETA1' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
-	id 'com.diffplug.spotless-changelog' version '3.0.1' apply false
+	id 'com.diffplug.spotless-changelog' version '3.1.1' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-	id 'com.gradle.plugin-publish' version '1.1.0' apply false
+	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '0.16.0' apply false
+	id 'dev.equo.ide' version '1.7.6' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
-	id 'io.github.gradle-nexus.publish-plugin' version '1.2.0' apply false
+	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://plugins.gradle.org/plugin/org.jetbrains.dokka
-	id 'org.jetbrains.dokka'                       version '1.8.10' apply false
+	id 'org.jetbrains.dokka'                       version '1.9.20' apply false
 	// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
-	id 'org.jetbrains.kotlin.jvm'                  version '1.8.20' apply false
+	id 'org.jetbrains.kotlin.jvm'                  version '2.0.0' apply false
 	// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.serialization
-	id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.20' apply false
+	id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.0' apply false
+	// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.multiplatform
+	id 'org.jetbrains.kotlin.multiplatform' version '2.0.0' apply false
+	// https://github.com/adamko-dev/dokkatoo/releases
+	id 'dev.adamko.dokkatoo-html' version '2.3.1' apply false
 }
 
 blowdryerSetup {
-	github 'diffplug/blowdryer-diffplug', 'tag', '7.0.2'
+	github 'diffplug/blowdryer-diffplug', 'tag', '7.3.0'
 	//devLocal '../blowdryer-diffplug'
 	setPluginsBlockTo {
 		it.file 'plugin.versions'
 		it.file 'plugin-kotlin.versions'
+		it.replace '3.0.2', '3.1.1'
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ class PlugPluginTest : GradleIntegrationHarness() {`
`14`	`14`	`.toContent(`
`15`	`15`	`"""`
`16`	`16`	`plugins {`
`17`		`- id 'org.jetbrains.kotlin.jvm' version '1.8.0'`
	`17`	`+ id 'org.jetbrains.kotlin.jvm' version '2.0.0'`
`18`	`18`	`id 'com.diffplug.atplug'`
`19`	`19`	`}`
`20`	`20`	`repositories {`
`21`	`21`	`mavenCentral()`
`22`	`22`	`}`
`23`	`23`	`dependencies {`
`24`	`24`	`implementation files("$runtimeJar")`
`25`		`- implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"`
	`25`	`+ implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1"`
`26`	`26`	`}`
`27`	`27`	`"""`
`28`	`28`	`.trimIndent())`