Browse Source

Update to Gradle 6.6

Signed-off-by: Graham <gpe@openrs2.dev>
pull/132/head
Graham 1 year ago
parent
commit
0f032e4f21
  1. 4
      .drone.yml
  2. 10
      build.gradle.kts
  3. BIN
      gradle/wrapper/gradle-wrapper.jar
  4. 2
      gradle/wrapper/gradle-wrapper.properties
  5. 2
      gradlew
  6. 21
      gradlew.bat

4
.drone.yml

@ -13,9 +13,9 @@ steps:
commands:
- ./gradlew --no-daemon publish
environment:
ORG_GRADLE_PROJECT_openrs2RepoUsername:
ORG_GRADLE_PROJECT_openrs2Username:
from_secret: repo_username
ORG_GRADLE_PROJECT_openrs2RepoPassword:
ORG_GRADLE_PROJECT_openrs2Password:
from_secret: repo_password
when:
branch:

10
build.gradle.kts

@ -53,6 +53,10 @@ allprojects {
}
}
tasks.withType<JavaCompile> {
options.release.set(11)
}
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "11"
@ -138,16 +142,14 @@ configure(subprojects.filter { it.isFree }) {
configure<PublishingExtension> {
repositories {
maven {
name = "openrs2"
url = if (version.toString().endsWith("-SNAPSHOT")) {
uri("https://repo.openrs2.dev/repository/openrs2-snapshots")
} else {
uri("https://repo.openrs2.dev/repository/openrs2")
}
credentials {
username = findProperty("openrs2RepoUsername")?.toString()
password = findProperty("openrs2RepoPassword")?.toString()
}
credentials(PasswordCredentials::class)
}
}

BIN
gradle/wrapper/gradle-wrapper.jar

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
gradlew

@ -130,7 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath

21
gradlew.bat

@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -64,21 +64,6 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell

Loading…
Cancel
Save