Skip to content

Commit a88241f

Browse files
authored
Update all deps and release 1.0 (#5)
2 parents b08cd81 + d8e486b commit a88241f

File tree

11 files changed

+226
-156
lines changed

11 files changed

+226
-156
lines changed

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: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ plugins {
55

66
repositories { mavenCentral() }
77

8+
spotlessChangelog {
9+
forceNextVersion '1.0.0'
10+
}
11+
812
group =.proj('maven_group', 'the maven group, recommend com.diffplug')
913
allprojects {
1014
apply from: 干.file('base/changelog.gradle')
1115
}
1216
apply from: 干.file('spotless/freshmark.gradle')
1317
apply from: 干.file('base/sonatype.gradle')
1418

15-
String VER_JUNIT_JUPITER = '5.8.2'
19+
String VER_JUNIT_JUPITER = '5.9.1'
1620
subprojects {
1721
apply from: 干.file('base/java8.gradle')
1822
apply from: 干.file('base/kotlin.gradle')
@@ -31,22 +35,22 @@ subprojects {
3135
ext.maven_name = 'AtPlug runtime'
3236
apply plugin: 'kotlinx-serialization'
3337
dependencies {
34-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
38+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
3539
}
3640
} else if (it.name == 'atplug-test-harness') {
3741
ext.maven_name='AtPlug test harness'
3842
dependencies {
3943
compileOnly "org.junit.jupiter:junit-jupiter-api:5.0.0"
40-
implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.10"
44+
implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
4145
implementation project(':atplug-runtime')
4246
}
4347
} else if (it.name == 'atplug-plugin-gradle') {
4448
ext.maven_name='AtPlug metadata generation Gradle plugin'
4549
apply from: 干.file('base/gradle-plugin.gradle')
4650
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'
51+
implementation "org.ow2.asm:asm:9.4"
52+
implementation 'com.diffplug.gradle:goomph:3.40.0'
53+
testImplementation 'org.assertj:assertj-core:3.23.1'
5054
}
5155
tasks.named('test') {
5256
dependsOn ':atplug-runtime:jar', ':atplug-runtime:testClasses'

gradle/wrapper/gradle-wrapper.jar

5.08 KB
Binary file not shown.
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-7.6-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

0 commit comments

Comments
 (0)