Skip to content

Commit 6513a3d

Browse files
committed
Bump all dependencies.
1 parent a8d28f0 commit 6513a3d

7 files changed

Lines changed: 21 additions & 22 deletions

File tree

atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/PlugGenerateTask.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.diffplug.atplug.tooling.gradle;
1717

18-
1918
import com.diffplug.atplug.tooling.PlugGeneratorJavaExecable;
2019
import com.diffplug.gradle.FileMisc;
2120
import com.diffplug.gradle.JRE;

atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/PlugPlugin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.diffplug.atplug.tooling.gradle;
1717

18-
1918
import java.io.File;
2019
import java.io.Serializable;
2120
import java.util.Arrays;
@@ -51,7 +50,7 @@ public void apply(Project project) {
5150
JavaPluginExtension javaExtension = project.getExtensions().getByType(JavaPluginExtension.class);
5251
SourceSet main = javaExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
5352

54-
Dependency dep = project.getDependencies().create("org.jetbrains.kotlin:kotlin-reflect:1.6.10");
53+
Dependency dep = project.getDependencies().create("org.jetbrains.kotlin:kotlin-reflect:1.8.0");
5554
Configuration plugGenConfig = project.getConfigurations().create("plugGenerate", plugGen -> {
5655
plugGen.extendsFrom(project.getConfigurations().getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME));
5756
plugGen.getDependencies().add(dep);

atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/PlugGeneratorTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class PlugGeneratorTest : ResourceHarness() {
2222
.provisionWithTransitives(
2323
true,
2424
listOf(
25-
"org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2",
26-
"org.jetbrains.kotlin:kotlin-reflect:1.6.10"))
25+
"org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1",
26+
"org.jetbrains.kotlin:kotlin-reflect:1.8.0"))
2727
val atplug_runtime = mutableSetOf(findRuntimeJar())
2828
atplug_runtime.addAll(transitives)
2929
return atplug_runtime

atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/TestProvisioner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ object TestProvisioner {
6767
config.resolve()
6868
} catch (e: ResolveException) {
6969
/* Provide Maven coordinates in exception message instead of static string 'detachedConfiguration' */
70-
throw ResolveException(config.description, e)
70+
throw ResolveException(mavenCoords.toString(), e)
7171
} finally {
7272
// delete the temp dir
7373
Files.walk(tempDir.toPath())

atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/gradle/PlugPluginTest.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@ class PlugPluginTest : GradleIntegrationHarness() {
1414
.toContent(
1515
"""
1616
plugins {
17-
id 'org.jetbrains.kotlin.jvm' version '1.6.10'
17+
id 'org.jetbrains.kotlin.jvm' version '1.8.0'
1818
id 'com.diffplug.atplug'
1919
}
2020
repositories {
2121
mavenCentral()
2222
}
2323
dependencies {
2424
implementation files("$runtimeJar")
25-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
25+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
2626
}
27-
""".trimIndent())
27+
"""
28+
.trimIndent())
2829

2930
val copy = { str: String ->
3031
val src = File("../atplug-runtime/src/test/java/com/diffplug/atplug/$str")

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ allprojects {
1212
apply from: 干.file('spotless/freshmark.gradle')
1313
apply from: 干.file('base/sonatype.gradle')
1414

15-
String VER_JUNIT_JUPITER = '5.8.2'
15+
String VER_JUNIT_JUPITER = '5.9.1'
1616
subprojects {
1717
apply from: 干.file('base/java8.gradle')
1818
apply from: 干.file('base/kotlin.gradle')
@@ -31,22 +31,22 @@ subprojects {
3131
ext.maven_name = 'AtPlug runtime'
3232
apply plugin: 'kotlinx-serialization'
3333
dependencies {
34-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
34+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
3535
}
3636
} else if (it.name == 'atplug-test-harness') {
3737
ext.maven_name='AtPlug test harness'
3838
dependencies {
3939
compileOnly "org.junit.jupiter:junit-jupiter-api:5.0.0"
40-
implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.10"
40+
implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
4141
implementation project(':atplug-runtime')
4242
}
4343
} else if (it.name == 'atplug-plugin-gradle') {
4444
ext.maven_name='AtPlug metadata generation Gradle plugin'
4545
apply from: 干.file('base/gradle-plugin.gradle')
4646
dependencies {
47-
implementation "org.ow2.asm:asm:9.2"
48-
implementation 'com.diffplug.gradle:goomph:3.35.0'
49-
testImplementation 'org.assertj:assertj-core:3.22.0'
47+
implementation "org.ow2.asm:asm:9.4"
48+
implementation 'com.diffplug.gradle:goomph:3.40.0'
49+
testImplementation 'org.assertj:assertj-core:3.23.1'
5050
}
5151
tasks.named('test') {
5252
dependsOn ':atplug-runtime:jar', ':atplug-runtime:testClasses'

settings.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
pluginManagement {
22
plugins {
3-
id 'com.diffplug.blowdryer' version '1.5.1'
4-
id 'com.diffplug.blowdryerSetup' version '1.5.1'
5-
id 'com.diffplug.configuration-cache-for-platform-specific-build' version '3.35.0'
6-
id 'com.diffplug.spotless' version '6.2.0'
7-
id 'com.diffplug.spotless-changelog' version '2.4.0'
8-
id 'org.jetbrains.kotlin.jvm' version '1.6.10'
9-
id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.10'
3+
id 'com.diffplug.blowdryer' version '1.6.0'
4+
id 'com.diffplug.blowdryerSetup' version '1.6.0'
5+
id 'com.diffplug.configuration-cache-for-platform-specific-build' version '3.40.0'
6+
id 'com.diffplug.spotless' version '6.12.0'
7+
id 'com.diffplug.spotless-changelog' version '2.4.1'
8+
id 'org.jetbrains.kotlin.jvm' version '1.8.0'
9+
id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.0'
1010
id 'com.gradle.plugin-publish' version '0.20.0'
1111
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
1212
id 'org.jdrupes.mdoclet' version '1.0.10'

0 commit comments

Comments
 (0)