Skip to content

Commit

Permalink
Merge branch 'refs/heads/fork/gradle-chores' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle/libs.versions.toml
  • Loading branch information
pdvrieze committed May 3, 2024
2 parents 48defd6 + c0958e4 commit 5373c40
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 22 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
@@ -0,0 +1,6 @@
# Always use Unix line endings for Unix shell scripts.
gradlew text eol=lf
*.sh text eol=lf

# Always use Windows line endings for Windows batch scripts.
*.bat text eol=crlf
23 changes: 12 additions & 11 deletions gradle/libs.versions.toml
@@ -1,17 +1,18 @@
[versions]
junit5-jupiter = "5.10.1"
kotlinx-serialization = "1.6.2"
kotlin = "1.9.23"
dokka = "1.9.10"
apiVersion = "1.8"
binaryValidator = "0.15.0-Beta.2"
woodstox = "6.5.1"
dokka = "1.9.20"
javaVersion = "8"
apiVersion = "1.8"
junit5-jupiter = "5.10.2"
kotlin = "1.9.23"
kotlinx-serialization = "1.6.3"
kxml2 = "2.3.0"
woodstox = "6.6.2"
xmlutil = "0.90.0-SNAPSHOT"

[libraries]
woodstox = { module = "com.fasterxml.woodstox:woodstox-core", version.ref="woodstox" }
kxml2 = "net.sf.kxml:kxml2:2.3.0"
kxml2 = { module = "net.sf.kxml:kxml2", version.ref = "kxml2" }

junit5-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5-jupiter" }
junit5-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5-jupiter" }
Expand All @@ -21,7 +22,7 @@ serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-jso
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin"}

[plugins]
binaryValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref="binaryValidator" }
dokka = { id = "org.jetbrains.dokka", version.ref="dokka" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref="kotlin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref="kotlin" }
binaryValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryValidator" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down

0 comments on commit 5373c40

Please sign in to comment.