From 28214d92042f0a4673f53699b1ff52af0226ccb3 Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Mon, 1 Feb 2021 10:36:32 -0800
Subject: Kotlin for Forge 1.8.0

---
 build.gradle | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'build.gradle')

diff --git a/build.gradle b/build.gradle
index 0e288ba..c0855c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,7 @@ buildscript {
     dependencies {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 'org.jetbrains.dokka:dokka-gradle-plugin:0.10.1'
         classpath group: 'com.wynprice.cursemaven', name: 'CurseMaven', version: '2.1.5'
     }
@@ -20,9 +21,10 @@ plugins {
 
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'kotlin'
+apply plugin: 'kotlinx-serialization'
 apply plugin: 'org.jetbrains.dokka'
 
-version = "1.7.0"
+version = "1.8.0"
 group = 'thedarkcolour.kotlinforforge'
 archivesBaseName = 'kotlinforforge'
 
@@ -48,7 +50,7 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.16.2-33.0.22'
+    minecraft 'net.minecraftforge:forge:1.16.5-36.0.9'
 
 	compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib", version: kotlin_version
 	compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk7", version: kotlin_version
@@ -57,13 +59,14 @@ dependencies {
     compile group: "org.jetbrains", name: "annotations", version: annotations_version
 	compile group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: coroutines_version
 	compile group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-jdk8", version: coroutines_version
+    compile group: "org.jetbrains.kotlinx", name: "kotlinx-serialization-json", version: serialization_version
 
     // Tests
     implementation 'junit:junit:4.11'
 }
 
 minecraft {
-    mappings channel: 'snapshot', version: '20200723-1.16.1'
+    mappings channel: 'snapshot', version: '20201028-1.16.3'
 
     runs {
         client {
@@ -90,6 +93,7 @@ shadowJar {
         include dependency("org.jetbrains:annotations:${annotations_version}")
         include dependency("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}")
         include dependency("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${coroutines_version}")
+        include dependency("org.jetbrains.kotlinx:kotlinx-serialization-json:${serialization_version}")
     }
 }
 
@@ -110,7 +114,7 @@ jar {
 
 static def options(kotlinOptions)  {
     kotlinOptions.jvmTarget = '1.8'
-    kotlinOptions.freeCompilerArgs = ["-Xexplicit-api=warning"]
+    kotlinOptions.freeCompilerArgs = ['-Xexplicit-api=warning', '-Xjvm-default=enable']
 }
 
 compileKotlin {
-- 
cgit