Update to kotlin 1.8.0 and gradle 7.6 (#61)

* Update to kotlin 1.8.0 and gradle 7.6

* add back language version to kotlin options

* Update build.gradle.kts

Co-authored-by: sschr15 <[email protected]>

Co-authored-by: sschr15 <[email protected]>

Author: NoComment1105

build.gradle.kts

@@ -19,6 +19,7 @@ plugins {
     alias(libs.plugins.licenser)
     alias(libs.plugins.git.hooks)
     alias(libs.plugins.dokka)
+    alias(libs.plugins.binary.compatibility)
     `maven-publish`
 }
 
@@ -89,7 +90,8 @@ allprojects {
         withType<KotlinCompile> {
             kotlinOptions {
                 jvmTarget = javaVersion.toString()
-                languageVersion = rootProject.libs.plugins.kotlin.get().version.strictVersion
+                languageVersion =
+                    rootProject.libs.plugins.kotlin.get().version.requiredVersion.substringBeforeLast(".")
             }
         }
 
@@ -248,6 +250,16 @@ tasks {
         from(dokkaHtmlMultiModule.get().outputDirectory)
         duplicatesStrategy = DuplicatesStrategy.FAIL
     }
+
+    /*
+     * To update the gradle version for the project, update the gradleVersion here, the sha256sum and then run
+     * `./gradlew wrapper -x build` or `gradle wrapper -x build` TWICE to update the gradle scripts.
+     */
+    wrapper {
+        gradleVersion = "7.6"
+        distributionType = Wrapper.DistributionType.BIN
+        distributionSha256Sum = "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b"
+    }
 }
 
 publishing {
@@ -266,3 +278,7 @@ gitHooks {
     // Before committing, check that licenses are all ready and the detekt checks have passed.
     setHooks(mapOf("pre-commit" to "checkLicenses apiCheck detekt"))
 }
+
+apiValidation {
+    ignoredProjects.addAll(listOf("quilt-kotlin-libraries", "core"))
+}

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.code.style=official
 
 version=1.0.1
-flk_version=1.8.6
+flk_version=1.9.0

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-atomic = "0.18.5"
+atomic = "0.19.0"
 coroutines = "1.6.4"
 datetime = "0.4.0"
 dokka = "1.7.20"
-kotlin = "1.7.22"
+kotlin = "1.8.0"
 minecraft = "1.19.2"
 qsl = "3.0.0-beta.24+1.19.2"
 quilt_loader = "0.17.8"
 quilt_mappings = "1.19.2+build.21"
 serialization = "1.4.1"
-serialization_plugin = "1.7.22" # usually same as kotlin but can lag behind
+serialization_plugin = "1.8.0" # usually same as kotlin but can lag behind
 
 [libraries]
 atomic = { module = "org.jetbrains.kotlinx:atomicfu-jvm", version.ref = "atomic" }
@@ -27,11 +27,11 @@ serialization_core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cor
 serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm", version.ref = "serialization" }
 
 [plugins]
-detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.20.0" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.22.0" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 git_hooks = { id = "com.github.jakemarsden.git-hooks", version = "0.0.2" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 licenser = { id = "org.quiltmc.gradle.licenser", version = "1.1.2" }
 quilt_loom = { id = "org.quiltmc.loom", version = "1.+" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization_plugin" }
-binary_compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.11.1" }
+binary_compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.12.1" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -86,7 +86,7 @@ APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -127,12 +127,14 @@ if [ -n "$JAVA_HOME" ] ; then
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
     JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
@@ -142,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -239,4 +241,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -34,7 +34,7 @@ set APP_HOME=%DIRNAME%
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -89,4 +89,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

gradlew.bat

@@ -1,6 +1,5 @@
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    alias(libs.plugins.binary.compatibility)
     alias(libs.plugins.serialization)
 }