Merge pull request #221 from Almighty-Alpaca/feature/fix-2022.1

Almighty-Alpaca · Apr 13, 2022 · e587cc8 · e587cc8
2 parents 3a93686 + f549229
commit e587cc8
Show file tree

Hide file tree

Showing 18 changed files with 274 additions and 204 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -66,17 +66,19 @@ subprojects {
     tasks {
         withType<KotlinCompile> {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
                 freeCompilerArgs += "-Xjvm-default=enable"
+
+                languageVersion = "1.4"
             }
         }
 
         withType<JavaCompile> {
-            targetCompatibility = "1.8"
-            sourceCompatibility = "1.8"
+            targetCompatibility = "11"
+            sourceCompatibility = "11"
 
             if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
-                options.compilerArgs as MutableList<String> += listOf("--release", "8")
+                options.compilerArgs as MutableList<String> += listOf("--release", "11")
             }
         }
     }
@@ -89,12 +91,13 @@ tasks {
         gradleReleaseChannel = GradleReleaseChannel.CURRENT.toString()
 
         rejectVersionIf {
-            sequenceOf("alpha", "beta", "rc", "cr", "m", "preview", "eap", "pr", "M")
-                .map { qualifier -> Regex("""[+_.-]?$qualifier[.\d-_]*$""", RegexOption.IGNORE_CASE) }
-                .any { regex -> regex.containsMatchIn(candidate.version) }
-        }
+            val preview = Regex("""[+_.-]?(alpha|beta|rc|cr|m|preview|eap|pr|M)[.\d-_]*$""", RegexOption.IGNORE_CASE)
+                .containsMatchIn(candidate.version)
 
-        rejectVersionIf { candidate.group.startsWith("org.jetbrains.kotlin") && candidate.version != currentVersion }
+            val wrongKotlinVersion = candidate.group.startsWith("org.jetbrains.kotlin") && candidate.version != currentVersion
+
+            return@rejectVersionIf preview || wrongKotlinVersion
+        }
     }
 
     withType<Wrapper> {

diff --git a/gradle.properties b/gradle.properties
@@ -22,28 +22,28 @@ kotlin.code.style=official
 
 # IDE releases: https://www.jetbrains.com/intellij-repository/releases or https://www.jetbrains.com/intellij-repository/snapshots
 
-versionAntlr=4.9.2
+versionAntlr=4.10
 versionCommonsIo=2.11.0
 versionCommonsText=1.9
 versionCoroutines=1.3.7
-versionGitVersions=0.12.3
-versionGradle=7.2
-versionIde=2020.3
+versionGitVersions=0.15.0
+versionGradle=7.4.2
+#versionIde=2020.3
 #versionIde=2021.1.2
 #versionIde=213.4293-EAP-CANDIDATE-SNAPSHOT
-#versionIde=LATEST-EAP-SNAPSHOT
-versionIntelliJ=1.1.4
+versionIde=LATEST-EAP-SNAPSHOT
+versionIntelliJGradle=1.5.2
 versionIpc=e18542f
-versionJackson=2.12.5
-versionJda=4.3.0_314
-versionJUnit=5.7.2
+versionJackson=2.13.2
+versionJda=4.4.0_352
+versionJUnit=5.8.2
 versionKonf=1.1.2
-versionKotlin=1.4.0
+versionKotlin=1.6.10
 versionKtor=1.5.2
-versionLogback=1.2.5
-versionOkHttp=4.9.1
+versionLogback=1.2.11
+versionOkHttp=4.9.3
 versionPngtastic=1.6
 versionRpc=2.0.2
 versionShadow=7.0.0
-versionVersions=0.39.0
+versionVersions=0.42.0
 versionZeroAllocationHashing=0.11
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-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists