Skip to content

Commit 511294b

Browse files
committed
Update dependencies to latest.
1 parent 327b58d commit 511294b

File tree

4 files changed

+24
-17
lines changed

4 files changed

+24
-17
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2020-2022 DiffPlug
2+
* Copyright (C) 2020-2023 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ public void apply(Project project) {
5050
JavaPluginExtension javaExtension = project.getExtensions().getByType(JavaPluginExtension.class);
5151
SourceSet main = javaExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
5252

53-
Dependency dep = project.getDependencies().create("org.jetbrains.kotlin:kotlin-reflect:1.8.0");
53+
Dependency dep = project.getDependencies().create("org.jetbrains.kotlin:kotlin-reflect:1.8.20");
5454
Configuration plugGenConfig = project.getConfigurations().create("plugGenerate", plugGen -> {
5555
plugGen.extendsFrom(project.getConfigurations().getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME));
5656
plugGen.getDependencies().add(dep);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class PlugGeneratorTest : ResourceHarness() {
2323
true,
2424
listOf(
2525
"org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1",
26-
"org.jetbrains.kotlin:kotlin-reflect:1.8.0"))
26+
"org.jetbrains.kotlin:kotlin-reflect:1.8.20"))
2727
val atplug_runtime = mutableSetOf(findRuntimeJar())
2828
atplug_runtime.addAll(transitives)
2929
return atplug_runtime

build.gradle

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,17 @@ allprojects {
1111
}
1212
apply from: 干.file('base/sonatype.gradle')
1313

14-
String VER_JUNIT_JUPITER = '5.9.1'
14+
String VER_JUNIT_JUPITER = '5.9.2'
1515
subprojects {
1616
apply from: 干.file('base/java.gradle')
1717
apply from: 干.file('base/kotlin.gradle')
18+
kotlin {
19+
sourceSets.all {
20+
languageSettings {
21+
languageVersion = "2.0"
22+
}
23+
}
24+
}
1825
apply from: 干.file('spotless/java.gradle')
1926
apply plugin: 'java-library'
2027

@@ -28,22 +35,22 @@ subprojects {
2835
ext.maven_name = 'AtPlug runtime'
2936
apply plugin: 'kotlinx-serialization'
3037
dependencies {
31-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
38+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
3239
}
3340
} else if (it.name == 'atplug-test-harness') {
3441
ext.maven_name='AtPlug test harness'
3542
dependencies {
3643
compileOnly "org.junit.jupiter:junit-jupiter-api:5.0.0"
37-
implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
44+
implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.20"
3845
implementation project(':atplug-runtime')
3946
}
4047
} else if (it.name == 'atplug-plugin-gradle') {
4148
ext.maven_name='AtPlug metadata generation Gradle plugin'
4249
apply from: 干.file('base/gradle-plugin.gradle')
4350
dependencies {
44-
implementation "org.ow2.asm:asm:9.4"
45-
implementation 'com.diffplug.gradle:goomph:3.40.0'
46-
testImplementation 'org.assertj:assertj-core:3.23.1'
51+
implementation "org.ow2.asm:asm:9.5"
52+
implementation 'com.diffplug.gradle:goomph:3.41.0'
53+
testImplementation 'org.assertj:assertj-core:3.24.2'
4754
}
4855
tasks.named('test') {
4956
dependsOn ':atplug-runtime:jar', ':atplug-runtime:testClasses'

settings.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ plugins {
88
// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
99
id 'com.diffplug.blowdryerSetup' version '1.7.0'
1010
// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
11-
id 'com.diffplug.spotless' version '6.14.0' apply false
11+
id 'com.diffplug.spotless' version '6.16.0' apply false
1212
// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
13-
id 'com.diffplug.spotless-changelog' version '2.4.1' apply false
13+
id 'com.diffplug.spotless-changelog' version '3.0.1' apply false
1414
// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
1515
id 'com.gradle.plugin-publish' version '1.1.0' apply false
1616
// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
17-
id 'dev.equo.ide' version '0.12.1' apply false
17+
id 'dev.equo.ide' version '0.16.0' apply false
1818
// https://github.com/gradle-nexus/publish-plugin/releases
19-
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' apply false
19+
id 'io.github.gradle-nexus.publish-plugin' version '1.2.0' apply false
2020
// https://plugins.gradle.org/plugin/org.jetbrains.dokka
21-
id 'org.jetbrains.dokka' version '1.7.20' apply false
21+
id 'org.jetbrains.dokka' version '1.8.10' apply false
2222
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
23-
id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
23+
id 'org.jetbrains.kotlin.jvm' version '1.8.20' apply false
2424
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.serialization
25-
id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.0' apply false
25+
id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.20' apply false
2626
}
2727

2828
blowdryerSetup {
29-
github 'diffplug/blowdryer-diffplug', 'tag', '7.0.0'
29+
github 'diffplug/blowdryer-diffplug', 'tag', '7.0.2'
3030
//devLocal '../blowdryer-diffplug'
3131
setPluginsBlockTo {
3232
it.file 'plugin.versions'

0 commit comments

Comments
 (0)