Skip to content

Commit

Permalink
Gradle upgrade to 8.2 and also some third party library upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
kranthise committed Aug 11, 2023
1 parent c15ac4a commit 52656b1
Show file tree
Hide file tree
Showing 18 changed files with 316 additions and 275 deletions.
25 changes: 12 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,14 @@ repositories {
maven {
url 'https://oss.sonatype.org/content/repositories/snapshots/' //for Gosu snapshot builds
}
jcenter()
}

dependencies {
testImplementation "junit:junit:${junitVersion}"
testImplementation "org.easytesting:fest-assert:${festAssertVersion}"
testImplementation "org.hamcrest:hamcrest-library:${hamcrestLibraryVersion}"
testImplementation "org.spockframework:spock-core:${spockCoreVersion}"
testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
testImplementation "org.opentest4j:opentest4j:${opentest4jVersion}"
}

gradlePlugin {
Expand All @@ -60,23 +59,23 @@ gradlePlugin {
}

//Test Helper Tasks
task gradleVersionHelper(type: VersionWriterTask) {
tasks.register('gradleVersionHelper', VersionWriterTask) {
propertyToRead = 'gradleVersion'
fallbackValue = project.gradle.gradleVersion
}

task gosuVersionHelper(type: VersionWriterTask) {
tasks.register('gosuVersionHelper', VersionWriterTask) {
propertyToRead = 'gosuVersion'
}

task testedVersionsHelper(type: VersionWriterTask) {
tasks.register('testedVersionsHelper', VersionWriterTask) {
propertyToRead = 'testedVersions'
}

dependencies {
testRuntime files(gradleVersionHelper) // Persist a file containing the gradleVersion
testRuntime files(gosuVersionHelper) // Persist a file containing the gosuVersion
testRuntime files(testedVersionsHelper) // Persist a file containing the testedVersions
testRuntimeOnly files(gradleVersionHelper) // Persist a file containing the gradleVersion
testRuntimeOnly files(gosuVersionHelper) // Persist a file containing the gosuVersion
testRuntimeOnly files(testedVersionsHelper) // Persist a file containing the testedVersions
}

test {
Expand All @@ -86,7 +85,7 @@ test {
environment('JAVA_TOOL_OPTIONS', '-Duser.language=en')
}

tasks.withType(AbstractCompile) {
tasks.withType(AbstractCompile).configureEach {
options.with {
compilerArgs += ['-Xlint:unchecked']
deprecation = true
Expand All @@ -96,7 +95,7 @@ tasks.withType(AbstractCompile) {

//constrain memory usage when running on CI server
if(System.getenv('CI') != null) {
tasks.withType(AbstractCompile) { //covers JavaCompile and GroovyCompile
tasks.withType(AbstractCompile).configureEach { //covers JavaCompile and GroovyCompile
options.fork = false
}
test {
Expand All @@ -105,14 +104,14 @@ if(System.getenv('CI') != null) {
}
}

task sourceJar(type: Jar) {
tasks.register('sourceJar', Jar) {
archiveClassifier = 'sources'
description 'generate sources'
dependsOn 'test'
from sourceSets.main.allJava
}

task javadocJar(type: Jar) {
tasks.register('javadocJar', Jar) {
archiveClassifier = 'javadoc'
description 'generate javadoc'
dependsOn 'test'
Expand All @@ -126,7 +125,7 @@ artifacts {

release {
git {
requireBranch = 'rel/.*'
requireBranch.set('rel/.*')
}
tagTemplate = 'v${version}'
}
Expand Down
18 changes: 9 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
group=org.gosu-lang.gosu
name=gradle-gosu-plugin
version=6.1.1-SNAPSHOT
version=8.0.0-SNAPSHOT

gradleVersion=6.5.1
gradleVersion=8.2
org.gradle.caching=false
org.gradle.daemon=false
org.gradle.jvmargs=-Xms1g -Xmx2g -Dfile.encoding=UTF-8
org.gradle.parallel=false
org.gradle.workers.max=1

gosuVersion=1.14.23
testedVersions=6.5.1
testedVersions=8.0.2

# Gradle plugins
gradlePublishPluginVersion=0.15.0
researchgateReleaseGradlePluginVersion=2.8.1
researchgateReleaseGradlePluginVersion=3.0.2

# For docker container
javaVersion=11

# Test implementation dependencies
assertjCoreVersion=3.18.1
festAssertVersion=1.3
hamcrestLibraryVersion=2.1
spockCoreVersion=1.2-groovy-2.5@jar
junitVersion=4.13.1
assertjCoreVersion=3.24.2
hamcrestLibraryVersion=2.2
spockCoreVersion=2.3-groovy-3.0@jar
junitVersion=4.13.2
opentest4jVersion=1.2.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 52656b1

Please sign in to comment.