Merge pull request #1 from TheElan/update-kotlin-to-1.5.30

Update kotlin to 1.5.30

build.gradle

@@ -1,35 +1,40 @@
 buildscript {
 	repositories {
-		jcenter()
 		maven {
-			name "forge"
-			url "http://files.minecraftforge.net/maven/"
+			name = "forge"
+			url = "https://files.minecraftforge.net/maven"
+		}
+		maven {
+			name = "sonatype"
+			url = "https://oss.sonatype.org/content/repositories/snapshots/"
+		}
+		maven {
+			name = "jitpack"
+			url = "https://jitpack.io"
 		}
 	}
 	dependencies {
-		classpath "net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT"
-		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
-		classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
+		classpath "com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT"
 	}
 }
 
-apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'forge'
-apply plugin: 'kotlin'
-apply plugin: 'signing'
+plugins {
+	id "com.github.johnrengelman.shadow" version "6.1.0"
+	id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
+}
+
+apply plugin: "signing"
+apply plugin: "forge"
 
 version = mod_version
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
-compileJava.options.encoding = 'UTF-8'
+compileJava.options.encoding = "UTF-8"
 
 minecraft {
 	version = mc_version + "-" + forge_version + "-" + mc_version
 	runDir = "run"
-
-	replaceIn "Forgelin.kt"
-	replace "@VERSION@", mod_version
 }
 
 processResources {
@@ -45,18 +50,21 @@ processResources {
 	}
 }
 
-repositories {
-	jcenter()
+dependencies {
+	implementation "org.jetbrains.kotlin:kotlin-stdlib",
+			"org.jetbrains.kotlin:kotlin-stdlib-jdk7",
+			"org.jetbrains.kotlin:kotlin-stdlib-jdk8",
+			"org.jetbrains.kotlin:kotlin-reflect",
+			"org.jetbrains:annotations",
+			"org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version",
+			"org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutines_version"
 }
 
-dependencies {
-	compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib", version: kotlin_version
-	compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk7", version: kotlin_version
-	compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: kotlin_version
-	compile group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: kotlin_version
-	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
+configurations {
+	shadowImplementation {
+		extendsFrom implementation
+		canBeResolved = true
+	}
 }
 
 jar {
@@ -68,17 +76,8 @@ jar {
 
 shadowJar {
 	classifier = ""
-	dependencies {
-		exclude 'net\\minecraftforge\\**'
-		exclude 'GradleStart*'
-		include(dependency("org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"))
-		include(dependency("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"))
-		include(dependency("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"))
-		include(dependency("org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"))
-		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}"))
-	}
+	configurations = [project.configurations.shadowImplementation]
+	
 	manifest {
 		attributes "FMLCorePlugin": "net.shadowfacts.forgelin.preloader.ForgelinPlugin",
 					"FMLCorePluginContainsFMLMod": "true"
@@ -88,7 +87,7 @@ shadowJar {
 tasks.build.dependsOn shadowJar
 
 tasks.withType(JavaCompile) {
-    options.compilerArgs.addAll(['-Xlint:unchecked', '-Xlint:deprecation'])
+	options.compilerArgs.addAll(["-Xlint:unchecked", "-Xlint:deprecation"])
 }
 
 artifacts {
@@ -100,24 +99,24 @@ reobf {
 	}
 }
 
-task reobfShadowJar(dependsOn: 'reobf'){
+task reobfShadowJar(dependsOn: "reobf") {
 }
 
 tasks.reobfShadowJar.mustRunAfter shadowJar
 tasks.build.dependsOn reobfShadowJar
 
-task signJar(dependsOn: 'reobf'){
-    doLast {
-        ant.signjar(
-            destDir: jar.destinationDir,
-            jar: jar.getArchivePath(),
-            alias: findProperty('keyStoreAlias') ?: '',
-            keystore: findProperty('keyStore') ?: '',
-            storepass: findProperty('keyStorePass') ?: '',
-            digestalg: findProperty('signDigestAlg') ?: '',
-            tsaurl: findProperty('signTSAurl') ?: '',
-            verbose: true
-            )
-    }
+task signJar(dependsOn: "reobf") {
+	doLast {
+		ant.signjar(
+				destDir: jar.destinationDirectory,
+				jar: jar.archiveFile,
+				alias: findProperty("keyStoreAlias") ?: "",
+				keystore: findProperty("keyStore") ?: "",
+				storepass: findProperty("keyStorePass") ?: "",
+				digestalg: findProperty("signDigestAlg") ?: "",
+				tsaurl: findProperty("signTSAurl") ?: "",
+				verbose: true
+		)
+	}
 }
 

gradle.properties

@@ -1,10 +1,9 @@
-mod_version = 1.8.4-GTNH-1.7.10-Edition
+mod_version = 1.9.0-GTNH-1.7.10-Edition
 group = net.shadowfacts
 archivesBaseName = Forgelin
 
 mc_version = 1.7.10
 forge_version = 10.13.4.1614
 
-kotlin_version = 1.3.72
-annotations_version = 16.0.3
-coroutines_version = 1.3.1
+kotlin_version = 1.5.30
+coroutines_version = 1.5.2

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip

src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt

@@ -13,7 +13,7 @@ object Forgelin {
 
 	const val MOD_ID = "forgelin"
 	const val NAME = "Forgelin"
-	const val VERSION = "@VERSION@"
+	const val VERSION = "1.9.0-GTNH-1.7.10-Edition"
 
 	@Mod.EventHandler
 	fun onPreInit(event: FMLPreInitializationEvent) {

src/main/resources/mcmod.info

@@ -8,7 +8,10 @@
 	  "credits": "Emberwalker, for the original Forgelin, shadowfacts for the fork",
 	  "url": "https://github.com/shadowfacts/Forgelin",
 	  "updateUrl": "",
-	  "authorList": [ "bartimaeusnek" ],
+	  "authorList": [ 
+      "bartimaeusnek", 
+      "Telan" 
+	  ],
 	  "screenshots": []
 	}
-]
+]