Skip to content

Commit f935d88

Browse files
jhhjhh
authored
Merge pull request #21 from strykeforce/update-deps
Update Kotlin, jline, logging and JUnit
2 parents 7c73ea1 + 877bd23 commit f935d88

File tree

4 files changed

+124
-131
lines changed

4 files changed

+124
-131
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎build.gradle‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "java"
3-
id "org.jetbrains.kotlin.jvm" version "1.4.21"
4-
id "edu.wpi.first.GradleRIO" version "2021.2.1"
3+
id "org.jetbrains.kotlin.jvm" version "1.5.0"
4+
id "edu.wpi.first.GradleRIO" version "2021.3.1"
55
}
66

77
version = "21.0.0"
@@ -44,6 +44,7 @@ deploy {
4444
def includeDesktopSupport = false
4545

4646
repositories {
47+
mavenCentral()
4748
jcenter()
4849
}
4950
// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
@@ -59,33 +60,39 @@ dependencies {
5960
nativeDesktopZip wpi.deps.vendor.jni(wpi.platforms.desktop)
6061

6162
// We need to add the Kotlin stdlib in order to use most Kotlin language features.
62-
implementation "org.jetbrains.kotlin:kotlin-stdlib"
63+
// implementation "org.jetbrains.kotlin:kotlin-stdlib"
6364

6465
// App
65-
implementation "org.jline:jline:3.9.0"
66-
implementation 'net.consensys.cava:cava-toml:0.5.0'
66+
implementation("org.jline:jline-terminal:3.20.0")
67+
implementation("org.jline:jline-reader:3.20.0")
68+
implementation("net.consensys.cava:cava-toml:0.5.0")
6769

6870
// Logging
69-
implementation 'io.github.microutils:kotlin-logging:1.6.10'
70-
implementation 'ch.qos.logback:logback-classic:1.2.3'
71+
implementation("io.github.microutils:kotlin-logging-jvm:2.0.6")
72+
implementation("ch.qos.logback:logback-classic:1.2.3")
7173

7274
// Koin
73-
implementation "org.koin:koin-core:1.0.2"
74-
implementation "org.koin:koin-logger-slf4j:1.0.2"
75-
testImplementation "org.koin:koin-test:1.0.2"
75+
implementation("org.koin:koin-core:1.0.2")
76+
implementation("org.koin:koin-logger-slf4j:1.0.2")
77+
testImplementation("org.koin:koin-test:1.0.2")
7678

7779
// Testing
78-
testImplementation "org.junit.jupiter:junit-jupiter-api:5.5.2"
79-
testImplementation "org.junit.jupiter:junit-jupiter-params:5.5.2"
80-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.5.2"
81-
testImplementation "org.assertj:assertj-core:3.11.1"
82-
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"
80+
testImplementation(platform("org.junit:junit-bom:5.7.2"))
81+
testImplementation("org.junit.jupiter:junit-jupiter")
82+
testImplementation("org.assertj:assertj-core:3.19.0")
83+
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
8384

8485
// Enable simulation gui support. Must check the box in vscode to enable support
8586
// upon debugging
8687
simulation wpi.deps.sim.gui(wpi.platforms.desktop, false)
8788
}
8889

90+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
91+
kotlinOptions {
92+
jvmTarget = "11"
93+
}
94+
}
95+
8996
test {
9097
useJUnitPlatform()
9198
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Jan 18 13:27:09 EST 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=permwrapper/dists
5-
zipStorePath=permwrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=permwrapper/dists

‎gradlew.bat‎

Lines changed: 100 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem https://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
17-
@if "%DEBUG%" == "" @echo off
18-
@rem ##########################################################################
19-
@rem
20-
@rem Gradle startup script for Windows
21-
@rem
22-
@rem ##########################################################################
23-
24-
@rem Set local scope for the variables with windows NT shell
25-
if "%OS%"=="Windows_NT" setlocal
26-
27-
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
29-
set APP_BASE_NAME=%~n0
30-
set APP_HOME=%DIRNAME%
31-
32-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
34-
35-
@rem Find java.exe
36-
if defined JAVA_HOME goto findJavaFromJavaHome
37-
38-
set JAVA_EXE=java.exe
39-
%JAVA_EXE% -version >NUL 2>&1
40-
if "%ERRORLEVEL%" == "0" goto init
41-
42-
echo.
43-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
44-
echo.
45-
echo Please set the JAVA_HOME variable in your environment to match the
46-
echo location of your Java installation.
47-
48-
goto fail
49-
50-
:findJavaFromJavaHome
51-
set JAVA_HOME=%JAVA_HOME:"=%
52-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
53-
54-
if exist "%JAVA_EXE%" goto init
55-
56-
echo.
57-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
58-
echo.
59-
echo Please set the JAVA_HOME variable in your environment to match the
60-
echo location of your Java installation.
61-
62-
goto fail
63-
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-
79-
:execute
80-
@rem Setup the command line
81-
82-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
83-
84-
@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%
86-
87-
:end
88-
@rem End local scope for the variables with windows NT shell
89-
if "%ERRORLEVEL%"=="0" goto mainEnd
90-
91-
:fail
92-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
93-
rem the _cmd.exe /c_ return code!
94-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
95-
exit /b 1
96-
97-
:mainEnd
98-
if "%OS%"=="Windows_NT" endlocal
99-
100-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
17+
@if "%DEBUG%" == "" @echo off
18+
@rem ##########################################################################
19+
@rem
20+
@rem Gradle startup script for Windows
21+
@rem
22+
@rem ##########################################################################
23+
24+
@rem Set local scope for the variables with windows NT shell
25+
if "%OS%"=="Windows_NT" setlocal
26+
27+
set DIRNAME=%~dp0
28+
if "%DIRNAME%" == "" set DIRNAME=.
29+
set APP_BASE_NAME=%~n0
30+
set APP_HOME=%DIRNAME%
31+
32+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
34+
35+
@rem Find java.exe
36+
if defined JAVA_HOME goto findJavaFromJavaHome
37+
38+
set JAVA_EXE=java.exe
39+
%JAVA_EXE% -version >NUL 2>&1
40+
if "%ERRORLEVEL%" == "0" goto init
41+
42+
echo.
43+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
44+
echo.
45+
echo Please set the JAVA_HOME variable in your environment to match the
46+
echo location of your Java installation.
47+
48+
goto fail
49+
50+
:findJavaFromJavaHome
51+
set JAVA_HOME=%JAVA_HOME:"=%
52+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
53+
54+
if exist "%JAVA_EXE%" goto init
55+
56+
echo.
57+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
58+
echo.
59+
echo Please set the JAVA_HOME variable in your environment to match the
60+
echo location of your Java installation.
61+
62+
goto fail
63+
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+
79+
:execute
80+
@rem Setup the command line
81+
82+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
83+
84+
@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%
86+
87+
:end
88+
@rem End local scope for the variables with windows NT shell
89+
if "%ERRORLEVEL%"=="0" goto mainEnd
90+
91+
:fail
92+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
93+
rem the _cmd.exe /c_ return code!
94+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
95+
exit /b 1
96+
97+
:mainEnd
98+
if "%OS%"=="Windows_NT" endlocal
99+
100+
:omega

0 commit comments

Comments
 (0)