updated build dependency

tum-gis · Jul 10, 2023 · c5124a2 · c5124a2
1 parent e977788
commit c5124a2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/build-rtron.yml b/.github/workflows/build-rtron.yml
@@ -34,7 +34,7 @@ jobs:
       - name: "Build uber JAR with Gradle"
         run: ./gradlew shadowJar
       - name: "Sanity testing: Validation test runs"
-        run: java -jar ./rtron-cli/build/libs/rtron.jar validate-opendrive ./samples/datasets ./samples/datasets-out
+        run: java -jar ./rtron-cli/build/libs/rtron.jar validate-opendrive ./samples/datasets ./samples/datasets-output
 
   build:
     needs: test

diff --git a/buildSrc/src/main/kotlin/Plugins.kt b/buildSrc/src/main/kotlin/Plugins.kt
@@ -16,7 +16,7 @@
 
 
 object PluginVersions {
-    const val shadowjar = "7.1.2"
+    const val shadowjar = "8.1.1"
     const val ktlint = "11.5.0"
     const val xjc = "1.6"
     const val versionChecker = "0.47.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/rtron-readerwriter/build.gradle.kts b/rtron-readerwriter/build.gradle.kts
@@ -101,6 +101,11 @@ tasks.named<Jar>("sourcesJar") {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
+tasks.named<org.gradle.jvm.tasks.Jar>("kotlinSourcesJar") {
+    dependsOn("${ProjectComponents.readerWriter}:xjcGeneration")
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
 tasks.withType<KtLintCheckTask> {
     dependsOn("${ProjectComponents.readerWriter}:xjcGeneration")
 }

diff --git a/samples/datasets-output/.gitignore b/samples/datasets-output/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore