Update all the dependencies.

vanniktech · Jul 2, 2023 · 91d1374 · 91d1374
1 parent f7098f2
commit 91d1374
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 32 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,29 +1,28 @@
 buildscript {
-  ext.kotlin_version = "1.7.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()
 }
 
 dependencies {
-  implementation "io.reactivex.rxjava3:rxjava:3.1.5"
+  implementation "io.reactivex.rxjava3:rxjava:3.1.6"
 
   testImplementation "junit:junit:4.13.2"
-  testImplementation "org.assertj:assertj-core:3.23.1"
-}
-
-wrapper {
-  gradleVersion = "7.6"
-  distributionType = Wrapper.DistributionType.ALL
+  testImplementation "org.assertj:assertj-core:3.24.2"
 }
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,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -85,9 +85,6 @@ done
 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='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,26 +130,29 @@ 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.
+    if ! command -v java >/dev/null 2>&1
+    then
+        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
 fi
 
 # Increase the maximum file descriptors if we can.
 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
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

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