Skip to content

Commit

Permalink
upgraded to gradle 7.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
James Wood authored and James Wood committed Jan 22, 2025
1 parent a23f4dc commit 063e31c
Show file tree
Hide file tree
Showing 7 changed files with 200 additions and 126 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup Gradle
uses: gradle/gradle-build-action@v3
with:
gradle-version: 6.3
gradle-version: 7.6.4

#########################################################################
# Versioning (featuring weird gradle output work-arounds)
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:

- name: Test and coverage
run: |
gradle wrapper --gradle-version 6.3
gradle wrapper --gradle-version 7.6.4
./gradlew test
./gradlew mergeJUnitReports
Expand Down
25 changes: 18 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ buildscript {
plugins {
id 'java'
id 'jacoco'
id "com.github.johnrengelman.shadow" version "7.0.0"
id 'com.github.ben-manes.versions' version '0.36.0'
id "com.github.johnrengelman.shadow" version "8.1.1"
id 'com.github.ben-manes.versions' version '0.51.0'
}

allprojects {
Expand All @@ -41,6 +41,11 @@ configurations {
runtimeClasspath {
extendsFrom developmentOnly
}
runtimeOnlyResolvable {
canBeResolved = true
canBeConsumed = false
extendsFrom runtimeOnly
}
}

configurations.all {
Expand All @@ -67,7 +72,7 @@ dependencies {

implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
implementation group: 'commons-io', name: 'commons-io', version: '2.18.0'
implementation group: 'edu.ucar', name: 'cdm-core', version: '5.7.0'
implementation group: 'edu.ucar', name: 'cdm-core', version: '5.4.2'

implementation group: 'org.geotools', name: 'gt-shapefile', version: '32.1'
implementation group: 'commons-cli', name: 'commons-cli', version: '1.4'
Expand Down Expand Up @@ -102,9 +107,15 @@ test {
jacocoTestReport {
dependsOn test // tests are required to run before generating the report
reports {
xml.enabled true
html.enabled true
csv.enabled true
xml {
required.set(true)
}
html {
required.set(true)
}
csv {
required.set(true)
}
}
}

Expand Down Expand Up @@ -247,7 +258,7 @@ task buildZip(type: Zip) {
from compileJava
from processResources
into('lib') {
from configurations.runtime
from configurations.runtimeOnlyResolvable
}
archiveFileName="forge-${getVersionName()}.zip"
}
Expand Down
10 changes: 5 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ WORKDIR /home/dockeruser
COPY . /home/dockeruser

# Download and install Gradle
RUN wget https://services.gradle.org/distributions/gradle-6.3-bin.zip && \
unzip gradle-6.3-bin.zip && \
rm gradle-6.3-bin.zip
RUN wget https://services.gradle.org/distributions/gradle-7.6.4-bin.zip && \
unzip gradle-7.6.4-bin.zip && \
rm gradle-7.6.4-bin.zip

# Add Gradle binaries to the PATH
ENV PATH="/home/dockeruser/gradle-6.3/bin:${PATH}"
ENV PATH="/home/dockeruser/gradle-7.6.4/bin:${PATH}"

# Display Gradle version to verify the installation
RUN gradle --version
Expand All @@ -28,7 +28,7 @@ USER dockeruser

RUN ./gradlew shadowJar

RUN wget https://github.com/nasa/cumulus-message-adapter/releases/download/v2.0.3/cumulus-message-adapter.zip
RUN wget https://github.com/nasa/cumulus-message-adapter/releases/download/v2.0.4/cumulus-message-adapter.zip
RUN mkdir cumulus-message-adapter
RUN unzip -d cumulus-message-adapter cumulus-message-adapter.zip

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 063e31c

Please sign in to comment.