From b20783a18e68d5605795c7053a8cc1b9da7db44b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 4 Jan 2023 02:55:12 -0800
Subject: [PATCH] Added UrlEncoder library

---
 .idea/kotlinc.xml                                 |  2 +-
 build.gradle                                      | 11 ++++++-----
 src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt |  7 ++-----
 version.properties                                |  6 +++---
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 4251b72..2b8a50f 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.22" />
+    <option name="version" value="1.8.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e3d2267..d05bf6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ plugins {
     id 'io.gitlab.arturbosch.detekt' version '1.22.0'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.7.22'
-    id 'org.jetbrains.kotlin.kapt' version '1.7.22'
+    id 'org.jetbrains.kotlin.jvm' version '1.8.0'
+    id 'org.jetbrains.kotlin.kapt' version '1.8.0'
     id 'org.jetbrains.kotlinx.kover' version '0.6.1'
     id 'org.sonarqube' version '3.5.0.2730'
     id 'pmd'
@@ -45,7 +45,7 @@ dependencies {
     compileOnly(semverProcessor)
 
     // PircBotX
-    implementation 'com.github.pircbotx:pircbotx:-SNAPSHOT'
+    implementation 'com.github.pircbotx:pircbotx:master-SNAPSHOT'
     // implementation fileTree(dir: 'lib', include: '*.jar')
 
     // Commons (mostly for PircBotX)
@@ -65,7 +65,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.5'
 
     // Logging
-    implementation 'org.slf4j:slf4j-api:2.0.5'
+    implementation 'org.slf4j:slf4j-api:2.0.6'
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$versions.log4j"
@@ -82,11 +82,12 @@ dependencies {
     implementation 'net.thauvin.erik:cryptoprice:1.0.0'
     implementation 'net.thauvin.erik:jokeapi:0.9-SNAPSHOT'
     implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
+    implementation 'net.thauvin.erik:urlencoder:1.0.0'
 
     testImplementation 'com.willowtreeapps.assertk:assertk-jvm:0.25'
 //    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
 //    testImplementation "org.mockito:mockito-core:4.0.0"
-    testImplementation 'org.testng:testng:7.6.1'
+    testImplementation 'org.testng:testng:7.7.1'
 }
 
 test {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 113a0ab..bc9860d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -33,6 +33,7 @@ package net.thauvin.erik.mobibot
 
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.Message.Companion.DEFAULT_COLOR
+import net.thauvin.erik.urlencoder.UrlEncoder
 import org.jsoup.Jsoup
 import org.pircbotx.Colors
 import org.pircbotx.PircBotX
@@ -46,7 +47,6 @@ import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 import java.net.HttpURLConnection
 import java.net.URL
-import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Paths
@@ -152,10 +152,7 @@ object Utils {
      * URL encodes the given string.
      */
     @JvmStatic
-    fun String.encodeUrl(): String = URLEncoder.encode(this, StandardCharsets.UTF_8)
-        .replace("+", "%20")
-        .replace("*", "%2A")
-        .replace("%7E", "~")
+    fun String.encodeUrl(): String = UrlEncoder.encode(this)
 
     /**
      * Returns a property as an int.
diff --git a/version.properties b/version.properties
index 2090357..61222a3 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Dec 13 01:22:17 PST 2022
-version.buildmeta=876
+#Fri Dec 30 11:11:04 PST 2022
+version.buildmeta=936
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=rc
 version.project=mobibot
-version.semver=0.8.0-rc+876
+version.semver=0.8.0-rc+936