Skip to content

Commit 7529a73

Browse files
mattmookmattmook
authored
Update to Kotlin 1.4 & Gradle 6.6 (#62)
1 parent 5683713 commit 7529a73

File tree

9 files changed

+34
-25
lines changed

9 files changed

+34
-25
lines changed

‎build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn
1818
import org.jetbrains.dokka.gradle.DokkaTask
1919

2020
plugins {
21-
kotlin("jvm") version "1.3.72" apply false
22-
id("io.gitlab.arturbosch.detekt") version "1.10.0"
21+
kotlin("jvm") version "1.4.0" apply false
22+
id("io.gitlab.arturbosch.detekt") version "1.11.2"
2323
id("com.appmattus.markdown") version "0.6.0"
2424
id("org.jetbrains.dokka") version "0.10.1"
2525
}
@@ -50,7 +50,7 @@ tasks.register<Delete>("clean") {
5050
}
5151

5252
dependencies {
53-
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.10.0")
53+
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.11.2")
5454
}
5555

5656
detekt {

‎cve-suppressions.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@
4242
<cve>CVE-2019-10103</cve>
4343
</suppress>
4444

45+
<suppress>
46+
<notes><![CDATA[
47+
CVE relates to dokka. No vulnerability as using Kotlin ≥ 1.4.0
48+
]]></notes>
49+
<gav regex="true">^org\.jetbrains\.dokka:dokka-fatjar:.*$</gav>
50+
<cve>CVE-2020-15824</cve>
51+
</suppress>
52+
4553
<suppress>
4654
<notes><![CDATA[
4755
CVE relates to dokka which controls the input to this library

‎fixture-generex/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
3737

3838
testImplementation(kotlin("reflect"))
39-
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.8")
39+
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
4040
}
4141

4242
lintOptions {

‎fixture-javafaker/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
3737

3838
testImplementation(kotlin("reflect"))
39-
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.8")
39+
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
4040
}
4141

4242
lintOptions {

‎fixture-kotest/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ apply(from = "$rootDir/gradle/scripts/dokka-javadoc.gradle.kts")
2828
dependencies {
2929
api(kotlin("stdlib-jdk8"))
3030
api(project(":fixture"))
31-
api("io.kotest:kotest-property-jvm:4.1.1")
31+
api("io.kotest:kotest-property-jvm:4.2.0")
3232

3333
testImplementation("junit:junit:4.13")
3434
testImplementation(kotlin("test"))
3535
testImplementation(kotlin("test-junit"))
3636
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
3737

3838
testImplementation(kotlin("reflect"))
39-
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.8")
39+
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
4040
}
4141

4242
lintOptions {

‎gradle/wrapper/gradle-wrapper.jar

3.22 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

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.5.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 14 additions & 17 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
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
154156
else
155157
eval `echo args$i`="\"$arg\""
156158
fi
157-
i=$((i+1))
159+
i=`expr $i + 1`
158160
done
159161
case $i in
160-
(0) set -- ;;
161-
(1) set -- "$args0" ;;
162-
(2) set -- "$args0" "$args1" ;;
163-
(3) set -- "$args0" "$args1" "$args2" ;;
164-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170172
esac
171173
fi
172174

@@ -175,14 +177,9 @@ save () {
175177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176178
echo " "
177179
}
178-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
179181

180182
# Collect all arguments for the java command, following the shell quoting and substitution rules
181183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
182184

183-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185-
cd "$(dirname "$0")"
186-
fi
187-
188185
exec "$JAVACMD" "$@"

‎gradlew.bat

Lines changed: 4 additions & 0 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

@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
8184

8285
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8386

87+
8488
@rem Execute Gradle
8589
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
8690

0 commit comments

Comments
 (0)