From 7a4b123d9988ee106616091e89bd68525cb65f69 Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Mon, 13 Jun 2022 13:48:48 +0200
Subject: [PATCH] Revert "Upgrade to Kotlin 1.7, add
 -Xskip-metadata-version-check to buildSrc"

This reverts commit d24230099ad3994d5988c3fabb2ddd6054212d5b.
---
 build.gradle              | 12 ++++++------
 buildSrc/build.gradle.kts |  9 +--------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8d93b402..96e1acff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,10 +40,10 @@ def multiplatformModules = [
 def doNotPublish = ["openrndr-demos"]
 
 project.ext {
-    kotlinApiVersion = '1.7'
-    kotlinLanguageVersion = '1.7'
-    kotlinVersion = '1.7.0'
-    kotlinxCoroutinesVersion = '1.6.1'
+    kotlinApiVersion = '1.6'
+    kotlinLanguageVersion = '1.6'
+    kotlinVersion = '1.6.20'
+    kotlinxCoroutinesVersion = '1.6.0'
     kotlinLoggingVersion = '2.1.21'
     kotlinxSerializationVersion = '1.3.2'
     spekVersion = '2.0.15'
@@ -66,8 +66,8 @@ def openrndrUseSnapshot = isReleaseVersion
 project.ext {
     openrndrVersion = ((findProperty("OPENRNDR.version")?:System.getenv("OPENRNDR_VERSION")) ?.replace("v","")) ?: "0.5.1-SNAPSHOT"
     jvmTarget = "1.8"
-    kotlinVersion = "1.7.0"
-    kotlinApiVersion = "1.7"
+    kotlinVersion = "1.6.20"
+    kotlinApiVersion = "1.6"
     spekVersion = "2.0.15"
     libfreenectVersion = "0.5.7-1.5.7"
     librealsense2Version = "2.50.0-1.5.7"
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index e6865fe2..99d55f6a 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -30,11 +30,4 @@ dependencies {
     preloadImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
 }
 
-tasks.getByName("compileKotlin").dependsOn("compilePreloadKotlin")
-
-// Here we deal with Gradle 7.4.2 using Kotlin 1.5 while OPENRNDR is compiled using Kotlin 1.7
-// This seems to work at this point in time but may cause serious problems in future scenarios in which either Kotlin,
-// Gradle or OPENRNDR are upgraded.
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.freeCompilerArgs = listOf("-Xskip-metadata-version-check")
-}
\ No newline at end of file
+tasks.getByName("compileKotlin").dependsOn("compilePreloadKotlin")
\ No newline at end of file