Skip to content

Commit 751c3a6

Browse files
authored
Merge pull request #42 from esoco/Gradle_9.x
Gradle 9.x
2 parents 8abc0cb + 3056905 commit 751c3a6

21 files changed

Lines changed: 847 additions & 765 deletions

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
uses: actions/setup-java@v3
1212
with:
1313
distribution: 'zulu'
14-
java-version: 11
14+
java-version: 17
1515
- name: Build with Gradle
1616
run: ./gradlew build

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ GWT Gradle Plugin
55
Release notes
66
-------------
77

8+
* 1.3.0: Compatibility with Gradle versions 9.x
9+
* Minimum Gradle version 8.x
10+
* Gradle 8.14.4 build
11+
* Minimum Java 17 for building
12+
13+
---------
14+
815
* 1.2.1: Fix - with envClassPath true classpath entries are now split at
916
semicolons
1017

build.gradle

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,45 @@
11
plugins {
22
id "java-library"
33
id "java-gradle-plugin"
4-
id "com.gradle.plugin-publish" version "2.0.0"
5-
id "pl.allegro.tech.build.axion-release" version "1.16.1"
6-
id "com.vanniktech.maven.publish" version "0.26.0"
4+
id "com.gradle.plugin-publish" version "2.1.1"
5+
id "pl.allegro.tech.build.axion-release" version "1.21.1"
6+
id "com.vanniktech.maven.publish" version "0.36.0"
77
}
88

99
scmVersion { tag { prefix.set("") } }
1010

1111
project.version = scmVersion.version
1212
project.group = 'de.esoco.gwt'
1313

14-
java {
15-
sourceCompatibility = JavaVersion.VERSION_1_8
16-
targetCompatibility = JavaVersion.VERSION_1_8
17-
}
18-
1914
repositories {
2015
mavenCentral()
2116
}
2217

2318
dependencies {
2419
implementation gradleApi()
25-
implementation "com.google.guava:guava:23.5-jre"
26-
testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5', gradleTestKit()
20+
implementation "com.google.guava:guava:33.6.0-jre"
21+
testImplementation 'org.spockframework:spock-core:2.4-groovy-5.0', gradleTestKit()
22+
}
23+
24+
tasks.withType(JavaCompile).configureEach {
25+
options.compilerArgs += ['-Xlint:deprecation']
26+
}
27+
28+
tasks.withType(Javadoc).configureEach {
29+
options.addStringOption('Xdoclint:none', '-quiet')
2730
}
2831

2932
processResources {
30-
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
33+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
3134
}
3235

3336
publishing {
3437
publications {
3538
pluginPublication(MavenPublication) {
3639
from components.java
37-
groupId project.group
38-
artifactId project.name
39-
version project.version
40+
groupId = project.group
41+
artifactId = project.name
42+
version = project.version
4043
}
4144
}
4245
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase = GRADLE_USER_HOME
22
distributionPath = wrapper/dists
33
zipStoreBase = GRADLE_USER_HOME
44
zipStorePath = wrapper/dists
5-
distributionUrl = https\://services.gradle.org/distributions/gradle-8.5-bin.zip
5+
distributionUrl = https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip

0 commit comments

Comments
 (0)