From 8b657c3dd2c717108eb21e526f67a0dc41f642a8 Mon Sep 17 00:00:00 2001
From: Geoffrey Challen <challen@illinois.edu>
Date: Fri, 3 Jun 2022 08:46:08 -0500
Subject: [PATCH] Fix override, remove jenv, update dependencies.

---
 .idea/runConfigurations/Clean.xml           | 23 +++++++++++++++++++++
 .java-version                               |  1 -
 .tool-versions                              |  1 +
 build.gradle.kts                            |  7 +++----
 jitpack.yml                                 |  4 ++--
 src/main/java/cs1/graphs/UnweightedGraph.kt |  2 +-
 6 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 .idea/runConfigurations/Clean.xml
 delete mode 100644 .java-version
 create mode 100644 .tool-versions

diff --git a/.idea/runConfigurations/Clean.xml b/.idea/runConfigurations/Clean.xml
new file mode 100644
index 0000000..0c4af72
--- /dev/null
+++ b/.idea/runConfigurations/Clean.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Clean" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="clean" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.java-version b/.java-version
deleted file mode 100644
index 422a10d..0000000
--- a/.java-version
+++ /dev/null
@@ -1 +0,0 @@
-openjdk64-16
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000..6f272a7
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+java openjdk-17.0.2
diff --git a/build.gradle.kts b/build.gradle.kts
index ad97c9f..7b932dc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 group = "com.github.cs125-illinois"
-version = "2022.4.0"
+version = "2022.6.0"
 
 plugins {
     kotlin("jvm") version "1.6.21"
@@ -12,10 +12,9 @@ plugins {
 }
 repositories {
     mavenCentral()
-    maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
 }
 dependencies {
-    testImplementation("io.kotest:kotest-runner-junit5:5.2.3")
+    testImplementation("io.kotest:kotest-runner-junit5:5.3.0")
     testImplementation("org.slf4j:slf4j-simple:1.7.36")
 }
 tasks.dependencyUpdates {
@@ -38,7 +37,7 @@ detekt {
 }
 tasks.withType<KotlinCompile> {
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_16.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
 tasks.withType<Test> {
diff --git a/jitpack.yml b/jitpack.yml
index bdc75b9..331926f 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,5 +1,5 @@
 before_install:
   - curl -s "https://get.sdkman.io" | bash
   - source ~/.sdkman/bin/sdkman-init.sh
-  - sdk install java 16.0.1-open
-  - sdk use java 16.0.1-open
\ No newline at end of file
+  - sdk install java 17.0.2-open
+  - sdk use java 17.0.2-open
diff --git a/src/main/java/cs1/graphs/UnweightedGraph.kt b/src/main/java/cs1/graphs/UnweightedGraph.kt
index 8ffca5d..f860262 100644
--- a/src/main/java/cs1/graphs/UnweightedGraph.kt
+++ b/src/main/java/cs1/graphs/UnweightedGraph.kt
@@ -356,7 +356,7 @@ class UnweightedGraph<T> private constructor(edges: Map<GraphNode<T>, Set<GraphN
             return randomUndirectedIntegerGraph(Random(), size, 128)
         }
 
-        private fun Random.nextInt(min: Int, max: Int) = let {
+        private fun Random.nextIntRange(min: Int, max: Int) = let {
             require(min < max)
             nextInt(max - min) + min
         }