Update to Kotlin for Forge 1.5.0

12 files changed, 93 insertions, 7 deletions

diff --git a/build.gradle b/build.gradle
index 46cdb16..d3fda5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,6 @@ buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
         maven { url = "https://maven.tterrag.com/" }
-        maven { url = "https://dl.bintray.com/kotlin/kotlin-eap" }
         maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
         jcenter()
         mavenCentral()
@@ -14,6 +13,7 @@ buildscript {
         classpath group: 'com.wynprice.cursemaven', name: 'CurseMaven', version: '2.1.5'
     }
 }
+
 plugins {
     id "com.github.johnrengelman.shadow" version "4.0.4"
 }
@@ -22,7 +22,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'kotlin'
 apply plugin: 'org.jetbrains.dokka'
 
-version = "1.4.1"
+version = "1.5.0"
 group = 'thedarkcolour.kotlinforforge'
 archivesBaseName = 'kotlinforforge'
 
@@ -32,7 +32,7 @@ tasks.build.dependsOn kotlinSourcesJar
 tasks.build.dependsOn shadowJar
 
 minecraft {
-    mappings channel: 'snapshot', version: '20200213-mixed-1.15.2'
+    mappings channel: 'snapshot', version: '20200723-1.16.1'
     
     runs {
         client {
@@ -80,7 +80,7 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.15.2-31.2.5'
+    minecraft 'net.minecraftforge:forge:1.16.2-33.0.22'
 
 	compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib", version: kotlin_version
 	compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk7", version: kotlin_version
diff --git a/gradle.properties b/gradle.properties
index 9b8074d..8a4ba0c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,6 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-kotlin_version=1.4.0-rc
-coroutines_version = 1.3.7
-annotations_version = 19.0.0
\ No newline at end of file
+kotlin_version=1.4.0
+coroutines_version = 1.3.9
+annotations_version = 20.0.0
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar
new file mode 100644
index 0000000..28cb1ee
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar
diff --git a/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar.md5 b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar.md5
new file mode 100644
index 0000000..190215f
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar.md5
@@ -0,0 +1 @@
+5bf0b1eeb675dd7494e5ad8dff8e6b56
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar.sha1 b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar.sha1
new file mode 100644
index 0000000..d301557
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar.sha1
@@ -0,0 +1 @@
+53714f7b6483f0b43a12c6ce7e8fba1354c6980b
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar
new file mode 100644
index 0000000..7804e75
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar
diff --git a/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar.md5 b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar.md5
new file mode 100644
index 0000000..d14de7b
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar.md5
@@ -0,0 +1 @@
+da1ad3aaa9ca6df32ea6a981e364c105
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar.sha1 b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar.sha1
new file mode 100644
index 0000000..de70c81
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar.sha1
@@ -0,0 +1 @@
+b9edf78bf0a179b372edba43266d6091cd550860
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom
new file mode 100644
index 0000000..969cb81
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>thedarkcolour</groupId>
+    <artifactId>kotlinforforge</artifactId>
+    <version>1.5.0</version>
+    <repositories>
+        <repository>
+            <id>kt-eap</id>
+            <name>Kotlin Early Access</name>
+            <url>https://dl.bintray.com/kotlin/kotlin-eap</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>1.4.0-rc</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk7</artifactId>
+            <version>1.4.0-rc</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>1.4.0-rc</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+            <version>1.4.0-rc</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>19.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core</artifactId>
+            <version>1.3.7</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-jdk8</artifactId>
+            <version>1.3.7</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom.md5 b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom.md5
new file mode 100644
index 0000000..866f11c
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom.md5
@@ -0,0 +1 @@
+6a8b0329bbbc732a9f2f1a29f12c1bb5
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom.sha1 b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom.sha1
new file mode 100644
index 0000000..729a2d6
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom.sha1
@@ -0,0 +1 @@
+54f47661af6a355358ff5fa9e6e542b0c2e02b5e
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.5.0/web.html b/thedarkcolour/kotlinforforge/1.5.0/web.html
new file mode 100644
index 0000000..7a29bac
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.5.0/web.html
@@ -0,0 +1,20 @@
+<html lang="HTML5">
+<link rel="stylesheet" href="../../style.css">
+<head><title>Index of /1.5.0/</title></head>
+<body>
+<h1>Index of /kotlinforforge/</h1>
+<hr>
+<pre><a href="../web.html">../</a>
+<a href="kotlinforforge-1.5.0-sources.jar">kotlinforforge-1.5.0-sources.jar</a>
+<a href="kotlinforforge-1.5.0-sources.jar.sha1">kotlinforforge-1.5.0-sources.jar.sha1</a>
+<a href="kotlinforforge-1.5.0-sources.jar.md5">kotlinforforge-1.5.0-sources.jar.md5</a>
+<a href="kotlinforforge-1.5.0.jar">kotlinforforge-1.5.0.jar</a>
+<a href="kotlinforforge-1.5.0.jar.sha1">kotlinforforge-1.5.0.jar.sha1</a>
+<a href="kotlinforforge-1.5.0.jar.md5">kotlinforforge-1.5.0.jar.md5</a>
+<a href="kotlinforforge-1.5.0.pom">kotlinforforge-1.5.0.pom</a>
+<a href="kotlinforforge-1.5.0.pom.sha1">kotlinforforge-1.5.0.pom.sha1</a>
+<a href="kotlinforforge-1.5.0.pom.md5">kotlinforforge-1.5.0.pom.md5</a>
+</pre>
+<hr>
+</body>
+</html>