Skip to content

Commit

Permalink
Merge pull request #1310 from pjonsson/gradle-upgrade
Browse files Browse the repository at this point in the history
gradle: upgrade to Gradle 8.3
  • Loading branch information
nfi authored Aug 18, 2023
2 parents 83bffda + bd56789 commit 4f7c369
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
- name: Build Cooja and Documentation
uses: gradle/gradle-build-action@v2
with:
gradle-version: 8.2.1
gradle-version: 8.3
cache-read-only: false
arguments: jar
- name: Test MSPSim
uses: gradle/gradle-build-action@v2
with:
gradle-version: 8.2.1
gradle-version: 8.3
arguments: test
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ tasks.withType(AbstractArchiveTask).configureEach {
}

tasks.register('copyDependencies', Copy) {
description = "Copy jar dependencies into ${buildDir}/libs/lib/."
def dir = layout.buildDirectory.dir("libs/lib")
description = "Copy jar dependencies into ${dir.get()}"
group = "Build"
from configurations.runtimeClasspath.files
into "build/libs/lib"
into dir
}

// Run Cooja with: java <JVM parameters> -jar build/libs/cooja.jar <Cooja parameters>
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 4f7c369

Please sign in to comment.