Skip to content

Commit 7acd0f9

Browse files
committed
Upgrade to Gradle 7.6.1
1 parent 3495736 commit 7acd0f9

File tree

5 files changed

+16
-32
lines changed

5 files changed

+16
-32
lines changed

build.gradle

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
buildscript {
2-
ext.reactiveStreamsVersion = "1.0.3"
3-
ext.rxjavaVersion = "3.1.5"
2+
ext.reactiveStreamsVersion = "1.0.4"
3+
ext.rxjavaVersion = "3.1.6"
44
ext.rxjava3DocVersion = "3.x"
55
ext.jmhLibVersion = "1.21"
6-
ext.licenseVersion = "0.15.0"
6+
ext.licenseVersion = "0.16.1"
77
ext.jmhGradleVersion = "0.5.3"
88
ext.junitVersion = "4.12"
99
ext.jacocoVersion = "0.8.7"
1010
ext.pmdVersion = "6.34.0"
1111
ext.bndVersion = "6.4.0"
12-
ext.mavenPublishPluginVersion = "0.18.0"
12+
ext.mavenPublishPluginVersion = "0.19.0"
1313

1414
repositories {
1515
mavenCentral()
@@ -48,21 +48,14 @@ if (!hasProperty('mainClass')) {
4848

4949
repositories {
5050
mavenCentral()
51-
maven { url 'https://oss.sonatype.org/content/groups/public' }
52-
53-
//maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
54-
//maven { url 'https://oss.jfrog.org/libs-snapshot' }
55-
//maven { url 'http://repo.spring.io/libs-snapshot' }
5651
}
5752

5853
dependencies {
59-
compile "io.reactivex.rxjava3:rxjava:${rxjavaVersion}"
54+
implementation "io.reactivex.rxjava3:rxjava:${rxjavaVersion}"
6055

61-
testCompile group: 'junit', name: 'junit', version: junitVersion
56+
testImplementation group: 'junit', name: 'junit', version: junitVersion
6257
}
6358

64-
apply plugin: 'maven'
65-
6659
apply plugin: 'biz.aQute.bnd.builder'
6760

6861
jar {

gradle/wrapper/gradle-wrapper.jar

501 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
129130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
3235
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
3336
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
3437

@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
3740

3841
set JAVA_EXE=java.exe
3942
%JAVA_EXE% -version >NUL 2>&1
40-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
4144

4245
echo.
4346
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
5154
set JAVA_HOME=%JAVA_HOME:"=%
5255
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5356

54-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
5558

5659
echo.
5760
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
6164

6265
goto fail
6366

64-
:init
65-
@rem Get command-line arguments, handling Windows variants
66-
67-
if not "%OS%" == "Windows_NT" goto win9xME_args
68-
69-
:win9xME_args
70-
@rem Slurp the command line arguments.
71-
set CMD_LINE_ARGS=
72-
set _SKIP=2
73-
74-
:win9xME_args_slurp
75-
if "x%~1" == "x" goto execute
76-
77-
set CMD_LINE_ARGS=%*
78-
7967
:execute
8068
@rem Setup the command line
8169

8270
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8371

72+
8473
@rem Execute Gradle
85-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
8675

8776
:end
8877
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)