Forgelin compat (#340)

* Initial take on forgelin/konas compat

* Revert "Revert to ForgeGradle 4.+"

This reverts commit ac36d99.

* Revert "Revert "Revert to ForgeGradle 4.+""

This reverts commit 7cc4a0e.

* Downgrade shadow to work with gradle 6 and by proxy FG4

* Change task structure

Co-authored-by: Constructor <[email protected]>

Author: Nep Nep

.github/workflows/nightly_build.yml

@@ -22,10 +22,10 @@ jobs:
         with:
           java-version: 1.8
 
-      - name: Fix wrapper permissions
+      - name: Elevate wrapper permissions
         run: chmod +x ./gradlew
 
-      - name: Gradle cache
+      - name: Loading gradle cache
         uses: actions/cache@v2
         with:
           path: |
@@ -38,7 +38,7 @@ jobs:
       - name: Prepare workspace
         run: ./gradlew --no-daemon classes
 
-      - name: Build forge mod
+      - name: Build lambda utility mod
         run: ./gradlew --build-cache build
 
       - name: Rename built forge mod
@@ -64,7 +64,7 @@ jobs:
           path: lambda-${{ github.run_number }}-SHA256.txt
 
       - name: Build plugin API
-        run: ./gradlew apiJar --no-build-cache
+        run: ./gradlew --no-build-cache buildApi
 
       - name: Rename built plugin API
         run: mv build/libs/lambda-*-api.jar lambda-${{ github.run_number }}-api.jar

build.gradle

@@ -7,6 +7,7 @@ buildscript {
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:4.+'
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
     }
 }
 
@@ -16,6 +17,7 @@ plugins {
 
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
+apply plugin: 'com.github.johnrengelman.shadow'
 
 version project.modVersion
 group project.modGroup
@@ -132,24 +134,33 @@ processResources {
     }
 }
 
-task sourceJar(type: Jar) { // Generate sources
+task buildApiSource(type: Jar) { // Generate sources
     group 'build'
     description 'Assemble API library source archive'
 
     archiveClassifier.set 'api-source'
     from sourceSets.main.allSource
 }
 
-task apiJar(type: Jar) {
+task buildApi(type: Jar) {
     group 'build'
     description 'Assemble API library archive'
 
     archiveClassifier.set 'api'
     from sourceSets.main.output
 }
 
-// Don't put baritone mixin here please c:
-jar {
+task buildAll {
+    group 'build'
+    description 'Assemble all jars'
+
+    dependsOn 'buildApi'
+    dependsOn 'buildApiSource'
+    dependsOn 'build'
+}
+
+shadowJar {
+    // Don't put baritone mixin here please c:
     manifest.attributes(
             'Manifest-Version': 1.0,
             'MixinConfigs': 'mixins.lambda.json',
@@ -159,27 +170,31 @@ jar {
             'ForceLoadAsMod': 'true'
     )
 
-    // Copy needed libs to jar
-    from {
-        exclude '**/module-info.class',
-                'DebugProbesKt.bin',
-                'META-INF/proguard/**',
-                'META-INF/versions/**',
-                'META-INF/**.RSA',
-                'META-INF/com.android.tools/**',
-                'META-INF/*.kotlin_module',
-                'kotlin/**/*.kotlin_metadata',
-                'kotlin/**/*.kotlin_builtins',
-                'META-INF/*.version'
-        configurations.jarLibs.collect {
-            it.isDirectory() ? it : zipTree(it)
-        }
+    archiveClassifier.set('')
+    exclude '**/module-info.class',
+            'DebugProbesKt.bin',
+            'META-INF/proguard/**',
+            'META-INF/versions/**',
+            'META-INF/**.RSA',
+            'META-INF/com.android.tools/**',
+            'META-INF/*.kotlin_module',
+            'kotlin/**/*.kotlin_metadata',
+            'kotlin/**/*.kotlin_builtins',
+            'META-INF/*.version'
+    configurations = [project.configurations.jarLibs]
+    relocate 'kotlin', 'com.lambda.shadow.kotlin'
+    relocate 'kotlinx', 'com.lambda.shadow.kotlinx'
+    finalizedBy 'reobfShadowJar'
+}
+
+reobf {
+    shadowJar {}
+    jar {
+        enabled = false
     }
 }
 
-task buildApi {
-    group 'build'
-    dependsOn sourceJar
-    dependsOn apiJar
-    description 'Assemble API library archives'
+artifacts {
+    shadowJar
 }
+