From 37bbbf0307a2fec29d5d1763cbc5f1b910def7e7 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Thu, 10 Sep 2020 10:26:16 -0700 Subject: Update to Kotlin for Forge 1.5.0 --- build.gradle | 8 +-- gradle.properties | 6 +-- .../1.5.0/kotlinforforge-1.5.0-sources.jar | Bin 0 -> 34530 bytes .../1.5.0/kotlinforforge-1.5.0-sources.jar.md5 | 1 + .../1.5.0/kotlinforforge-1.5.0-sources.jar.sha1 | 1 + .../kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar | Bin 0 -> 97502 bytes .../1.5.0/kotlinforforge-1.5.0.jar.md5 | 1 + .../1.5.0/kotlinforforge-1.5.0.jar.sha1 | 1 + .../kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom | 60 +++++++++++++++++++++ .../1.5.0/kotlinforforge-1.5.0.pom.md5 | 1 + .../1.5.0/kotlinforforge-1.5.0.pom.sha1 | 1 + thedarkcolour/kotlinforforge/1.5.0/web.html | 20 +++++++ 12 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar create mode 100644 thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar.md5 create mode 100644 thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar.sha1 create mode 100644 thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar create mode 100644 thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar.md5 create mode 100644 thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar.sha1 create mode 100644 thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom create mode 100644 thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom.md5 create mode 100644 thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.pom.sha1 create mode 100644 thedarkcolour/kotlinforforge/1.5.0/web.html 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 Binary files /dev/null and b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0-sources.jar differ 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 Binary files /dev/null and b/thedarkcolour/kotlinforforge/1.5.0/kotlinforforge-1.5.0.jar differ 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 @@ + + + 4.0.0 + thedarkcolour + kotlinforforge + 1.5.0 + + + kt-eap + Kotlin Early Access + https://dl.bintray.com/kotlin/kotlin-eap + + + + + org.jetbrains.kotlin + kotlin-stdlib + 1.4.0-rc + compile + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + 1.4.0-rc + compile + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 1.4.0-rc + compile + + + org.jetbrains.kotlin + kotlin-reflect + 1.4.0-rc + compile + + + org.jetbrains + annotations + 19.0.0 + compile + + + org.jetbrains.kotlinx + kotlinx-coroutines-core + 1.3.7 + compile + + + org.jetbrains.kotlinx + kotlinx-coroutines-jdk8 + 1.3.7 + compile + + + 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 @@ + + +Index of /1.5.0/ + +

Index of /kotlinforforge/

+
+
../
+kotlinforforge-1.5.0-sources.jar
+kotlinforforge-1.5.0-sources.jar.sha1
+kotlinforforge-1.5.0-sources.jar.md5
+kotlinforforge-1.5.0.jar
+kotlinforforge-1.5.0.jar.sha1
+kotlinforforge-1.5.0.jar.md5
+kotlinforforge-1.5.0.pom
+kotlinforforge-1.5.0.pom.sha1
+kotlinforforge-1.5.0.pom.md5
+
+
+ + -- cgit