Skip to content

Commit

Permalink
Bumping dependency versions and preparing for 3.1.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
bobbylight committed Dec 27, 2020
1 parent 10e381e commit a5aa09d
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 26 deletions.
2 changes: 1 addition & 1 deletion AutoComplete/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ assert current().isJava8Compatible()
archivesBaseName = 'autocomplete'

dependencies {
api 'com.fifesoft:rsyntaxtextarea:3.1.0'
api 'com.fifesoft:rsyntaxtextarea:3.1.2'
}

ext.isReleaseVersion = !project.version.endsWith('SNAPSHOT')
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.0'
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0'
}
}

plugins {
id 'com.github.spotbugs' version '4.0.1'
id 'com.github.spotbugs' version '4.6.0'
}

group = 'com.fifesoft'
Expand All @@ -23,7 +23,7 @@ allprojects {
}

wrapper {
gradleVersion = '6.2.2'
gradleVersion = '6.7.1'
}
}

Expand All @@ -34,7 +34,7 @@ subprojects {
apply plugin: 'com.github.spotbugs'

checkstyle {
toolVersion = '8.30'
toolVersion = '8.37'
configFile = '../config/checkstyle/checkstyle.xml' as File // Relative to subprojects
}

Expand All @@ -60,7 +60,7 @@ subprojects {
}

dependencies {
testImplementation 'junit:junit:4.13'
testImplementation 'junit:junit:4.13.1'
}

compileJava {
Expand Down
1 change: 1 addition & 0 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@
<!--<module name="FinalParameters"/>-->
<!-- <module name="TodoComment"/> -->
<module name="UpperEll"/>
<module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>

</module>

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Note that Maven- and signing-related properties are in <gradle-user-home>/gradle.properties
javaVersion=1.8
version=3.1.1-SNAPSHOT
version=3.1.1
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ esac

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


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
Expand Down Expand Up @@ -129,6 +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
Expand Down
22 changes: 4 additions & 18 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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%
Expand All @@ -64,28 +64,14 @@ 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

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
Expand Down

0 comments on commit a5aa09d

Please sign in to comment.