From a9b5b04f8d947bdca53da19da0bbd6d9f9f0eb6b Mon Sep 17 00:00:00 2001
From: NovaFox161 <novamaday@gmail.com>
Date: Sun, 10 Oct 2021 20:35:04 -0500
Subject: [PATCH] Bump to Kotlin 1.5.31

---
 .gitignore       |  2 ++
 build.gradle.kts | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index e9291c69..d0e5f8b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ web/src/main/resources/static/vendor/
 /.gradle/
 
 **/.DS_STORE
+**/bin/
+**/.settings/
diff --git a/build.gradle.kts b/build.gradle.kts
index 22b37dd4..7ba291ec 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,10 +4,10 @@ plugins {
     java
 
     //kotlin
-    kotlin("jvm") version "1.5.21"
-    kotlin("plugin.serialization") version "1.5.21"
-    kotlin("plugin.spring") version "1.5.21" apply false
-    id("org.jetbrains.kotlin.plugin.allopen") version "1.5.21" apply false
+    kotlin("jvm") version "1.5.31"
+    kotlin("plugin.serialization") version "1.5.31"
+    kotlin("plugin.spring") version "1.5.31" apply false
+    id("org.jetbrains.kotlin.plugin.allopen") version "1.5.31" apply false
 
     //Other
     id("org.springframework.boot") version ("2.5.2") apply false
@@ -38,8 +38,8 @@ allprojects {
     java.targetCompatibility = JavaVersion.VERSION_16
 
     //Versions
-    val kotlinVersion by ext("1.5.21")
-    val kotlinxSerializationVersion by ext("1.2.2")
+    val kotlinVersion by ext("1.5.31")
+    val kotlinxSerializationVersion by ext("1.3.0-RC")
 
     val discord4jVersion by ext(discord4jVersion)
     val discord4jStoresVersion by ext("3.2.1")
@@ -122,8 +122,8 @@ allprojects {
         sourceSets {
             all {
                 languageSettings {
-                    useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")
-                    useExperimentalAnnotation("kotlin.RequiresOptIn")
+                    optIn("kotlinx.serialization.ExperimentalSerializationApi")
+                    optIn("kotlin.RequiresOptIn")
                 }
             }
         }