build: upgrade to Kotlin 1.6.21 and Gradle 7.1

next-step · May 16, 2022 · 8c500b8 · 8c500b8
1 parent d1c0934
commit 8c500b8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
-    java
-    kotlin("jvm") version "1.5.31"
-    id("org.jlleitschuh.gradle.ktlint") version "10.2.0"
+    kotlin("jvm") version "1.6.21"
+    id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
 
 group = "camp.nextstep.edu"
@@ -12,13 +11,11 @@ repositories {
 }
 
 dependencies {
-    testImplementation("org.junit.jupiter", "junit-jupiter", "5.8.1")
-    testImplementation("org.assertj", "assertj-core", "3.21.0")
+    testImplementation("org.junit.jupiter", "junit-jupiter", "5.8.2")
+    testImplementation("org.assertj", "assertj-core", "3.22.0")
+    testImplementation("io.kotest", "kotest-runner-junit5", "5.2.3")
 }
 
-configure<JavaPluginConvention> {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-}
 tasks {
     compileKotlin {
         kotlinOptions.jvmTarget = "1.8"
@@ -31,6 +28,5 @@ tasks {
     }
     ktlint {
         verbose.set(true)
-        disabledRules.addAll("import-ordering")
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

diff --git a/src/main/kotlin/empty.txt → src/main/kotlin/.gitkeep b/src/main/kotlin/empty.txt → src/main/kotlin/.gitkeep
diff --git a/src/test/kotlin/empty.txt → src/test/kotlin/.gitkeep b/src/test/kotlin/empty.txt → src/test/kotlin/.gitkeep