From 931d1f3e25f4c7ea1df2ad14d4fe8a8f886f40d1 Mon Sep 17 00:00:00 2001
From: Steffen Paul <steffen.paul@metro.digital>
Date: Sat, 12 Feb 2022 17:22:38 +0100
Subject: [PATCH 1/4] Migrate away from bintray and upgrade jvm to 11

---
 build.gradle.kts                                    | 7 +++----
 buildSrc/build.gradle.kts                           | 2 +-
 docs/setup-android.md                               | 2 +-
 integration-test/build.gradle.kts                   | 5 ++---
 integration-test/buildSrc/build.gradle.kts          | 2 +-
 integration-test/settings.gradle.kts                | 5 ++---
 samples/android/build.gradle                        | 4 ++--
 samples/jvm/build.gradle                            | 4 ++--
 samples/multiplatform/build.gradle                  | 4 ++--
 spek-gradle-plugin/build.gradle.kts                 | 2 +-
 spek-ide-plugin-android-studio/build.gradle.kts     | 2 +-
 spek-ide-plugin-intellij-base-jvm/build.gradle.kts  | 2 +-
 spek-ide-plugin-intellij-base/build.gradle.kts      | 2 +-
 spek-ide-plugin-intellij-idea/build.gradle.kts      | 2 +-
 spek-kotlin-compiler-plugin-jvm/build.gradle.kts    | 2 +-
 spek-kotlin-compiler-plugin-native/build.gradle.kts | 2 +-
 16 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 47b222bb5..2d674b683 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,9 +15,8 @@ reckon {
 
 allprojects {
     repositories {
-        jcenter()
-        maven ("https://dl.bintray.com/kotlin/kotlin-eap")
-        maven ("https://kotlin.bintray.com/kotlinx")
+        mavenCentral()
+        maven ("https://www.jetbrains.com/intellij-repository/releases")
     }
 
     if (Files.exists(Paths.get("$rootDir/local.properties"))) {
@@ -39,7 +38,7 @@ allprojects {
             if (this is KotlinJvmCompile) {
                 kotlinOptions {
                     apiVersion = "1.4"
-                    jvmTarget = "1.8"
+                    jvmTarget = "11"
                 }
             } else {
                 kotlinOptions {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 6ee18ab3b..ed856f910 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
     gradlePluginPortal()
 }
 
diff --git a/docs/setup-android.md b/docs/setup-android.md
index d9815c8e6..137b027c6 100644
--- a/docs/setup-android.md
+++ b/docs/setup-android.md
@@ -56,7 +56,7 @@ The setup assumes you are using Gradle `4.7` or above as it has a built-in suppo
 
 ```groovy
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 // setup dependencies
diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts
index e81003960..f33992876 100644
--- a/integration-test/build.gradle.kts
+++ b/integration-test/build.gradle.kts
@@ -4,9 +4,8 @@ plugins {
 }
 
 repositories {
-  jcenter()
-  maven ("https://dl.bintray.com/kotlin/kotlin-eap")
-  maven ("https://kotlin.bintray.com/kotlinx")
+  mavenCentral()
+  maven ("https://www.jetbrains.com/intellij-repository/releases")
 }
 
 kotlin {
diff --git a/integration-test/buildSrc/build.gradle.kts b/integration-test/buildSrc/build.gradle.kts
index becf8fd8e..62993a7f8 100644
--- a/integration-test/buildSrc/build.gradle.kts
+++ b/integration-test/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 repositories {
-  jcenter()
+  mavenCentral()
 }
 
 dependencies {
diff --git a/integration-test/settings.gradle.kts b/integration-test/settings.gradle.kts
index c3110dce8..e72b525e2 100644
--- a/integration-test/settings.gradle.kts
+++ b/integration-test/settings.gradle.kts
@@ -11,9 +11,8 @@ includeBuild("../") {
 
 pluginManagement {
   repositories {
-    jcenter()
-    maven ("https://dl.bintray.com/kotlin/kotlin-eap")
-    maven ("https://kotlin.bintray.com/kotlinx")
+    mavenCentral()
+    maven ("https://www.jetbrains.com/intellij-repository/releases")
   }
   resolutionStrategy.eachPlugin {
     if (requested.id.id == "org.spekframework.spek2.multiplatform") {
diff --git a/samples/android/build.gradle b/samples/android/build.gradle
index c583ac38e..56fba271c 100644
--- a/samples/android/build.gradle
+++ b/samples/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     ext.kotlin_version = '1.3.61'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.1'
@@ -19,7 +19,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         // uncomment to use development build
          maven { url "https://dl.bintray.com/spekframework/spek-dev" }
     }
diff --git a/samples/jvm/build.gradle b/samples/jvm/build.gradle
index e32be0883..1cdd35891 100644
--- a/samples/jvm/build.gradle
+++ b/samples/jvm/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     ext.spek_version = '2.1.0-alpha.0.14+a763c30'
 
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -15,7 +15,7 @@ apply plugin: 'kotlin'
 
 repositories {
     mavenLocal()
-    jcenter()
+    mavenCentral()
     // uncomment to use development build
      maven { url "https://dl.bintray.com/spekframework/spek-dev" }
 }
diff --git a/samples/multiplatform/build.gradle b/samples/multiplatform/build.gradle
index 55abec4d2..fd9c9e68f 100644
--- a/samples/multiplatform/build.gradle
+++ b/samples/multiplatform/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     ext.spek_version = '2.1.0-alpha.0.14+a763c30'
 
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -15,7 +15,7 @@ apply plugin: 'kotlin-multiplatform'
 
 repositories {
     mavenLocal()
-    jcenter()
+    mavenCentral()
     // uncomment to use development build
      maven { url "https://dl.bintray.com/spekframework/spek-dev" }
 }
diff --git a/spek-gradle-plugin/build.gradle.kts b/spek-gradle-plugin/build.gradle.kts
index 29d596a8a..fffd9a645 100644
--- a/spek-gradle-plugin/build.gradle.kts
+++ b/spek-gradle-plugin/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 gradlePlugin {
diff --git a/spek-ide-plugin-android-studio/build.gradle.kts b/spek-ide-plugin-android-studio/build.gradle.kts
index 85329efb8..9b803ac8c 100644
--- a/spek-ide-plugin-android-studio/build.gradle.kts
+++ b/spek-ide-plugin-android-studio/build.gradle.kts
@@ -62,7 +62,7 @@ dependencies {
 tasks {
     compileKotlin {
         kotlinOptions {
-            jvmTarget = "1.8"
+            jvmTarget = "11"
         }
     }
 
diff --git a/spek-ide-plugin-intellij-base-jvm/build.gradle.kts b/spek-ide-plugin-intellij-base-jvm/build.gradle.kts
index c51c7c5de..c8318ad99 100644
--- a/spek-ide-plugin-intellij-base-jvm/build.gradle.kts
+++ b/spek-ide-plugin-intellij-base-jvm/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
 tasks {
     compileKotlin {
         kotlinOptions {
-            jvmTarget = "1.8"
+            jvmTarget = "11"
         }
     }
 }
diff --git a/spek-ide-plugin-intellij-base/build.gradle.kts b/spek-ide-plugin-intellij-base/build.gradle.kts
index 389f31017..dcb8a0a22 100644
--- a/spek-ide-plugin-intellij-base/build.gradle.kts
+++ b/spek-ide-plugin-intellij-base/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
 tasks {
     compileKotlin {
         kotlinOptions {
-            jvmTarget = "1.8"
+            jvmTarget = "11"
         }
     }
 
diff --git a/spek-ide-plugin-intellij-idea/build.gradle.kts b/spek-ide-plugin-intellij-idea/build.gradle.kts
index 9d7c24bfb..35bd6b392 100644
--- a/spek-ide-plugin-intellij-idea/build.gradle.kts
+++ b/spek-ide-plugin-intellij-idea/build.gradle.kts
@@ -75,7 +75,7 @@ dependencies {
 tasks {
     compileKotlin {
         kotlinOptions {
-            jvmTarget = "1.8"
+            jvmTarget = "11"
         }
     }
 
diff --git a/spek-kotlin-compiler-plugin-jvm/build.gradle.kts b/spek-kotlin-compiler-plugin-jvm/build.gradle.kts
index abe679cd1..a9b2e7bcf 100644
--- a/spek-kotlin-compiler-plugin-jvm/build.gradle.kts
+++ b/spek-kotlin-compiler-plugin-jvm/build.gradle.kts
@@ -18,7 +18,7 @@ tasks {
 
     compileKotlin {
         kotlinOptions {
-            jvmTarget = "1.8"
+            jvmTarget = "11"
         }
     }
 }
diff --git a/spek-kotlin-compiler-plugin-native/build.gradle.kts b/spek-kotlin-compiler-plugin-native/build.gradle.kts
index 090c91d3b..afe4699d0 100644
--- a/spek-kotlin-compiler-plugin-native/build.gradle.kts
+++ b/spek-kotlin-compiler-plugin-native/build.gradle.kts
@@ -18,7 +18,7 @@ tasks {
 
     compileKotlin {
         kotlinOptions {
-            jvmTarget = "1.8"
+            jvmTarget = "11"
         }
     }
 }

From d129e3ca0dba3682e5b322cd5fbcea191e5a89cb Mon Sep 17 00:00:00 2001
From: Steffen Paul <45816746+MetroSteffenPaul@users.noreply.github.com>
Date: Sat, 12 Feb 2022 17:34:41 +0100
Subject: [PATCH 2/4] Add snapshot repo

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2d674b683..7f3a4b54c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,6 +17,7 @@ allprojects {
     repositories {
         mavenCentral()
         maven ("https://www.jetbrains.com/intellij-repository/releases")
+        maven ("https://www.jetbrains.com/intellij-repository/snapshots")
     }
 
     if (Files.exists(Paths.get("$rootDir/local.properties"))) {

From 837021273aeb94b43618ca0f93322777667ffcb2 Mon Sep 17 00:00:00 2001
From: Steffen Paul <45816746+MetroSteffenPaul@users.noreply.github.com>
Date: Sat, 12 Feb 2022 17:35:25 +0100
Subject: [PATCH 3/4] Add snapshot repo

---
 integration-test/build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts
index f33992876..9c2ba8c9b 100644
--- a/integration-test/build.gradle.kts
+++ b/integration-test/build.gradle.kts
@@ -5,7 +5,8 @@ plugins {
 
 repositories {
   mavenCentral()
-  maven ("https://www.jetbrains.com/intellij-repository/releases")
+  maven ("https://www.jetbrains.com/intellij-repository/releases")  
+  maven ("https://www.jetbrains.com/intellij-repository/snapshots")
 }
 
 kotlin {

From 7e5a593b4e6eeef14e46116a53717e4f716e773c Mon Sep 17 00:00:00 2001
From: Steffen Paul <45816746+MetroSteffenPaul@users.noreply.github.com>
Date: Sat, 12 Feb 2022 17:36:09 +0100
Subject: [PATCH 4/4] Add snapshot repo

---
 integration-test/settings.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/integration-test/settings.gradle.kts b/integration-test/settings.gradle.kts
index e72b525e2..47c24c011 100644
--- a/integration-test/settings.gradle.kts
+++ b/integration-test/settings.gradle.kts
@@ -13,6 +13,7 @@ pluginManagement {
   repositories {
     mavenCentral()
     maven ("https://www.jetbrains.com/intellij-repository/releases")
+    maven ("https://www.jetbrains.com/intellij-repository/snapshots")
   }
   resolutionStrategy.eachPlugin {
     if (requested.id.id == "org.spekframework.spek2.multiplatform") {