Upgrade dependencies

Gradle -> 8.3 Compose -> 1.5.0-rc03 Batik -> 1.17
kirill-grouchnikov · Aug 22, 2023 · 04cba03 · 04cba03
1 parent 8113c85
commit 04cba03
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -69,7 +69,7 @@ tasks.register("copyJars") {
     mkdir("drop/${project.property("VERSION_NAME")}")
     subprojects {
         copy {
-            from("${project.buildDir}/libs")
+            from("${project.layout.buildDirectory.get().asFile}/libs")
             include("${rootProject.name}-${project.name}-*-${project.property("VERSION_NAME")}.jar")
             into("${rootProject.projectDir}/drop/${project.property("VERSION_NAME")}")
         }

diff --git a/docs/tools/svg-transcoder/svg-transcoder.md b/docs/tools/svg-transcoder/svg-transcoder.md
@@ -24,7 +24,7 @@ The `SvgBatchConverter` class is the entry point into the offline batch converte
 
 Assuming your `AURORA_VERSION` variable points to the latest version of the Aurora libraries, here is how you would run the converter pipeline for a single SVG source folder (note that the dependencies versions need to match the Aurora version, see [the list below](#dependency-versions-for-the-aurora-svg-transcoder)):
 
-<code>java <b>-cp</b> ../drop/$AURORA_VERSION/aurora-svg-transcoder-desktop-$AURORA_VERSION.jar:../build/libs/batik-all-1.16.jar:../build/libs/xml-apis-1.4.01.jar:../build/libs/xml-apis-ext-1.3.04.jar:../build/libs/xmlgraphics-commons-2.7.jar:../build/libs/kotlin-stdlib-$KOTLIN_VERSION.jar:../build/libs/kotlin-stdlib-common-$KOTLIN_VERSION.jar:../build/libs/kotlinx-coroutines-core-jvm-$KOTLIN_COROUTINES_VERSION.jar:../build/libs/ui-graphics-desktop-$COMPOSE_VERSION.jar:../build/libs/ui-geometry-desktop-$COMPOSE_VERSION.jar org.pushingpixels.aurora.tools.svgtranscoder.SvgBatchConverter <b>sourceFolder=</b>../demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/svg <b>outputPackageName=</b>org.pushingpixels.aurora.demo.svg <b>templateFile=</b>/org/pushingpixels/aurora/tools/svgtranscoder/AuroraSvgTranscoderTemplate.templ
+<code>java <b>-cp</b> ../drop/$AURORA_VERSION/aurora-svg-transcoder-desktop-$AURORA_VERSION.jar:../build/libs/batik-all-1.17.jar:../build/libs/xml-apis-1.4.01.jar:../build/libs/xml-apis-ext-1.3.04.jar:../build/libs/xmlgraphics-commons-2.9.jar:../build/libs/kotlin-stdlib-$KOTLIN_VERSION.jar:../build/libs/kotlin-stdlib-common-$KOTLIN_VERSION.jar:../build/libs/kotlinx-coroutines-core-jvm-$KOTLIN_COROUTINES_VERSION.jar:../build/libs/ui-graphics-desktop-$COMPOSE_VERSION.jar:../build/libs/ui-geometry-desktop-$COMPOSE_VERSION.jar org.pushingpixels.aurora.tools.svgtranscoder.SvgBatchConverter <b>sourceFolder=</b>../demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/svg <b>outputPackageName=</b>org.pushingpixels.aurora.demo.svg <b>templateFile=</b>/org/pushingpixels/aurora/tools/svgtranscoder/AuroraSvgTranscoderTemplate.templ
 </code>
 
 The first part is enumerating all the jar files required for the converter - Aurora, Batik and Kotlin. In this sample script, the Aurora SVG transcoder jar is under `drop` folder after running the `gradlew copyJars` command. The Batik dependencies are under `build/libs` after running the `gradlew getDependencies` command.
@@ -47,7 +47,7 @@ The `SvgDeepBatchConverter` class is the entry point into the offline recursive
 
 Assuming your `AURORA_VERSION` variable points to the latest version of the Aurora libraries, here is how you would run the converter pipeline recursively for all SVG files under a folder (note that the dependencies versions need to match the Aurora version, see [the list below](#dependency-versions-for-the-aurora-svg-transcoder)):
 
-<code>java <b>-cp</b> ../drop/$AURORA_VERSION/aurora-svg-transcoder-desktop-$AURORA_VERSION.jar:../build/libs/batik-all-1.16.jar:../build/libs/xml-apis-1.4.01.jar:../build/libs/xml-apis-ext-1.3.04.jar:../build/libs/xmlgraphics-commons-2.7.jar:../build/libs/kotlin-stdlib-$KOTLIN_VERSION.jar:../build/libs/kotlin-stdlib-common-$KOTLIN_VERSION.jar:../build/libs/kotlinx-coroutines-core-jvm-$KOTLIN_COROUTINES_VERSION.jar:../build/libs/ui-graphics-desktop-$COMPOSE_VERSION.jar:../build/libs/ui-geometry-desktop-$COMPOSE_VERSION.jar org.pushingpixels.aurora.tools.svgtranscoder.SvgDeepBatchConverter <b>sourceRootFolder=</b>../demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/svg <b>outputRootPackageName=</b>org.pushingpixels.aurora.demo.svg <b>templateFile=</b>/org/pushingpixels/aurora/tools/svgtranscoder/AuroraSvgTranscoderTemplate.templ
+<code>java <b>-cp</b> ../drop/$AURORA_VERSION/aurora-svg-transcoder-desktop-$AURORA_VERSION.jar:../build/libs/batik-all-1.17.jar:../build/libs/xml-apis-1.4.01.jar:../build/libs/xml-apis-ext-1.3.04.jar:../build/libs/xmlgraphics-commons-2.9.jar:../build/libs/kotlin-stdlib-$KOTLIN_VERSION.jar:../build/libs/kotlin-stdlib-common-$KOTLIN_VERSION.jar:../build/libs/kotlinx-coroutines-core-jvm-$KOTLIN_COROUTINES_VERSION.jar:../build/libs/ui-graphics-desktop-$COMPOSE_VERSION.jar:../build/libs/ui-geometry-desktop-$COMPOSE_VERSION.jar org.pushingpixels.aurora.tools.svgtranscoder.SvgDeepBatchConverter <b>sourceRootFolder=</b>../demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/svg <b>outputRootPackageName=</b>org.pushingpixels.aurora.demo.svg <b>templateFile=</b>/org/pushingpixels/aurora/tools/svgtranscoder/AuroraSvgTranscoderTemplate.templ
 </code>
 
 The first part is enumerating all the jar files required for the converter - Aurora, Batik and Kotlin. In this sample script, the Aurora SVG transcoder jar is under `drop` folder after running the `gradlew copyJars` command. The Batik dependencies are under `build/libs` after running the `gradlew getDependencies` command.
@@ -95,10 +95,10 @@ The following table summarizes the level of support for different SVG elements.
 ### Dependency versions for the Aurora SVG transcoder
 
 * For **2.0-SNAPSHOT**, use
-  * `batik-all-1.16.jar`
+  * `batik-all-1.17.jar`
   * `xml-apis-1.4.01.jar`
   * `xml-apis-ext-1.3.04.jar`
-  * `xmlgraphics-commons-2.7.jar`
+  * `xmlgraphics-commons-2.9.jar`
 * For **1.3.0**, use
   * `batik-all-1.16.jar`
   * `xml-apis-1.4.01.jar`

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 kotlin = "1.9.0"
 coroutines = "1.7.3"
-compose = "1.5.0-rc02"
+compose = "1.5.0-rc03"
 dokka = "1.9.0-dev-228"
-batik = "1.16"
+batik = "1.17"
 
 versionchecker = "0.47.0"
 mavenpublish = "0.25.3"

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-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/scripts/convert-svg.sh b/scripts/convert-svg.sh
@@ -19,8 +19,8 @@ alias JAVA="java"
 AURORA_VERSION=2.0-SNAPSHOT
 KOTLIN_VERSION=1.9.0
 KOTLIN_COROUTINES_VERSION=1.6.4
-COMPOSE_VERSION=1.5.0-rc02
-CLASSPATH=../drop/$AURORA_VERSION/aurora-svg-transcoder-desktop-$AURORA_VERSION.jar:../build/libs/batik-all-1.16.jar:../build/libs/xml-apis-1.4.01.jar:../build/libs/xml-apis-ext-1.3.04.jar:../build/libs/xmlgraphics-commons-2.7.jar:../build/libs/kotlin-stdlib-$KOTLIN_VERSION.jar:../build/libs/kotlin-stdlib-common-$KOTLIN_VERSION.jar:../build/libs/kotlinx-coroutines-core-jvm-$KOTLIN_COROUTINES_VERSION.jar:../build/libs/ui-graphics-desktop-$COMPOSE_VERSION.jar:../build/libs/ui-geometry-desktop-$COMPOSE_VERSION.jar
+COMPOSE_VERSION=1.5.0-rc03
+CLASSPATH=../drop/$AURORA_VERSION/aurora-svg-transcoder-desktop-$AURORA_VERSION.jar:../build/libs/batik-all-1.17.jar:../build/libs/xml-apis-1.4.01.jar:../build/libs/xml-apis-ext-1.3.04.jar:../build/libs/xmlgraphics-commons-2.9.jar:../build/libs/kotlin-stdlib-$KOTLIN_VERSION.jar:../build/libs/kotlin-stdlib-common-$KOTLIN_VERSION.jar:../build/libs/kotlinx-coroutines-core-jvm-$KOTLIN_COROUTINES_VERSION.jar:../build/libs/ui-graphics-desktop-$COMPOSE_VERSION.jar:../build/libs/ui-geometry-desktop-$COMPOSE_VERSION.jar
 
 # Don't convert the demo transcoding to deep traversal since one of the
 # folders needs class name prefix while others don't

diff --git a/scripts/screenshot/doc-robot-schemes.sh b/scripts/screenshot/doc-robot-schemes.sh
@@ -19,7 +19,7 @@ alias JAVA="java"
 AURORA_VERSION=2.0-SNAPSHOT
 KOTLIN_VERSION=1.9.0
 KOTLIN_COROUTINES_VERSION=1.6.4
-COMPOSE_VERSION=1.5.0-rc02
+COMPOSE_VERSION=1.5.0-rc03
 CLASSPATH=../../drop/$AURORA_VERSION/aurora-screenshot-desktop-$AURORA_VERSION.jar:../../demo/build/libs/aurora-demo-desktop.jar:../build/libs/:../../build/libs/*
 
 java -cp $CLASSPATH org.pushingpixels.aurora.tools.screenshot.theming.schemes.AuroraColorSchemesDriverKt \

diff --git a/scripts/screenshot/doc-robot-skins-icons.sh b/scripts/screenshot/doc-robot-skins-icons.sh
@@ -19,7 +19,7 @@ alias JAVA="java"
 AURORA_VERSION=2.0-SNAPSHOT
 KOTLIN_VERSION=1.9.0
 KOTLIN_COROUTINES_VERSION=1.6.4
-COMPOSE_VERSION=1.5.0-rc02
+COMPOSE_VERSION=1.5.0-rc03
 CLASSPATH=../../drop/$AURORA_VERSION/aurora-screenshot-desktop-$AURORA_VERSION.jar:../../demo/build/libs/aurora-demo-desktop.jar:../build/libs/:../../build/libs/*
 
 java -cp $CLASSPATH org.pushingpixels.aurora.tools.screenshot.theming.skins.AuroraSkinsIconFilterDriverKt \

diff --git a/scripts/screenshot/doc-robot-skins.sh b/scripts/screenshot/doc-robot-skins.sh
@@ -19,7 +19,7 @@ alias JAVA="java"
 AURORA_VERSION=2.0-SNAPSHOT
 KOTLIN_VERSION=1.9.0
 KOTLIN_COROUTINES_VERSION=1.6.4
-COMPOSE_VERSION=1.5.0-rc02
+COMPOSE_VERSION=1.5.0-rc03
 CLASSPATH=../../drop/$AURORA_VERSION/aurora-screenshot-desktop-$AURORA_VERSION.jar:../../demo/build/libs/aurora-demo-desktop.jar:../build/libs/:../../build/libs/*
 
 java -cp $CLASSPATH org.pushingpixels.aurora.tools.screenshot.theming.skins.AuroraSkinsDriverKt \