Update all the dependencies.

vanniktech · Jul 2, 2023 · 4b0fe2c · 4b0fe2c
1 parent b12b0d6
commit 4b0fe2c
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [11]
+        java_version: [17]
 
     steps:
       - name: Checkout

diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,21 @@
 buildscript {
-  ext.kotlin_version = "1.8.22"
-
   repositories {
     mavenCentral()
     gradlePluginPortal()
   }
   dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
   }
 }
 
 apply plugin: "kotlin"
 
+kotlin {
+  jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 repositories {
   mavenCentral()
 }
@@ -22,8 +26,3 @@ dependencies {
   testImplementation "junit:junit:4.13.2"
   testImplementation "org.assertj:assertj-core:3.24.2"
 }
-
-wrapper {
-  gradleVersion = "8.2"
-  distributionType = Wrapper.DistributionType.ALL
-}
diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle14Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle14Test.kt
@@ -2,7 +2,7 @@ package com.vanniktech.rxriddles
 
 import com.vanniktech.rxriddles.solutions.Riddle14Solution
 import io.reactivex.rxjava3.core.Single
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle15Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle15Test.kt
@@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
 import com.vanniktech.rxriddles.solutions.Riddle15Solution
 import com.vanniktech.rxriddles.tools.RxRule
 import io.reactivex.rxjava3.core.Observable
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test
 import java.util.concurrent.TimeUnit.SECONDS

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle16Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle16Test.kt
@@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
 import com.vanniktech.rxriddles.solutions.Riddle16Solution
 import io.reactivex.rxjava3.subjects.PublishSubject
 import io.reactivex.rxjava3.subjects.SingleSubject
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 /** Solution [Riddle16Solution] */

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle19Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle19Test.kt
@@ -2,7 +2,7 @@ package com.vanniktech.rxriddles
 
 import com.vanniktech.rxriddles.Riddle19.Interaction
 import com.vanniktech.rxriddles.solutions.Riddle19Solution
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 /** Solution [Riddle19Solution] */

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle21Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle21Test.kt
@@ -2,7 +2,7 @@ package com.vanniktech.rxriddles
 
 import com.vanniktech.rxriddles.solutions.Riddle21Solution
 import io.reactivex.rxjava3.core.Observable
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 /** Solution [Riddle21Solution] */

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle26Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle26Test.kt
@@ -4,7 +4,7 @@ import com.vanniktech.rxriddles.solutions.Riddle26Solution
 import com.vanniktech.rxriddles.tools.RxRule
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test
 import java.util.concurrent.TimeUnit.MILLISECONDS

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle27Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle27Test.kt
@@ -2,7 +2,7 @@ package com.vanniktech.rxriddles
 
 import com.vanniktech.rxriddles.solutions.Riddle27Solution
 import io.reactivex.rxjava3.subjects.PublishSubject
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 /** Solution [Riddle27Solution] */

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle28Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle28Test.kt
@@ -2,7 +2,7 @@ package com.vanniktech.rxriddles
 
 import com.vanniktech.rxriddles.solutions.Riddle28Solution
 import io.reactivex.rxjava3.subjects.CompletableSubject
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle29Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle29Test.kt
@@ -2,7 +2,7 @@ package com.vanniktech.rxriddles
 
 import com.vanniktech.rxriddles.solutions.Riddle29Solution
 import io.reactivex.rxjava3.subjects.MaybeSubject
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.util.concurrent.atomic.AtomicReference
 

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle30Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle30Test.kt
@@ -2,7 +2,7 @@ package com.vanniktech.rxriddles
 
 import com.vanniktech.rxriddles.solutions.Riddle30Solution
 import io.reactivex.rxjava3.subjects.SingleSubject
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle33Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle33Test.kt
@@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
 import com.vanniktech.rxriddles.solutions.Riddle33Solution
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.schedulers.Schedulers
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.util.concurrent.Executors
 

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle34Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle34Test.kt
@@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
 import com.vanniktech.rxriddles.solutions.Riddle34Solution
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.schedulers.Schedulers
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.util.concurrent.Executors
 

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle6Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle6Test.kt
@@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
 import com.vanniktech.rxriddles.solutions.Riddle6Solution
 import com.vanniktech.rxriddles.tools.RxRule
 import io.reactivex.rxjava3.core.Single
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test
 import java.util.concurrent.TimeUnit.SECONDS

diff --git a/src/test/kotlin/com/vanniktech/rxriddles/Riddle8Test.kt b/src/test/kotlin/com/vanniktech/rxriddles/Riddle8Test.kt
@@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
 import com.vanniktech.rxriddles.solutions.Riddle8Solution
 import com.vanniktech.rxriddles.tools.RxRule
 import io.reactivex.rxjava3.core.Observable
-import org.assertj.core.api.Java6Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test
 import java.util.concurrent.TimeUnit.MILLISECONDS