Replace reprod patched mixingradle with specific upstream version
This commit is contained in:
@@ -12,17 +12,14 @@ subprojects {
|
|||||||
name = "forge"
|
name = "forge"
|
||||||
url = "http://files.minecraftforge.net/maven"
|
url = "http://files.minecraftforge.net/maven"
|
||||||
}
|
}
|
||||||
maven {
|
|
||||||
name = "sponge"
|
|
||||||
url = "https://repo.spongepowered.org/maven"
|
|
||||||
}
|
|
||||||
maven {
|
maven {
|
||||||
name = "sonatype"
|
name = "sonatype"
|
||||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||||
}
|
}
|
||||||
|
maven { url 'https://jitpack.io' }
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath('org.spongepowered:mixingradle:0.6-SNAPSHOT'){
|
classpath('com.github.SpongePowered:MixinGradle:dcfaf61'){ // 0.6
|
||||||
// Because forgegradle requires 6.0 (not -debug-all) while mixingradle depends on 5.0
|
// Because forgegradle requires 6.0 (not -debug-all) while mixingradle depends on 5.0
|
||||||
// and putting mixin right here will place it before forge in the class loader
|
// and putting mixin right here will place it before forge in the class loader
|
||||||
exclude group: 'org.ow2.asm', module: 'asm-debug-all'
|
exclude group: 'org.ow2.asm', module: 'asm-debug-all'
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
From 6de53f46b4b14c7667e7cff8010bde040ae7967b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jonas Herzig <me@johni0702.de>
|
|
||||||
Date: Fri, 25 Aug 2017 18:34:39 +0200
|
|
||||||
Subject: [PATCH] Do not include java version and user name in jar
|
|
||||||
|
|
||||||
---
|
|
||||||
build.gradle | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/build.gradle b/build.gradle
|
|
||||||
index db80dfa..2f5e041 100644
|
|
||||||
--- a/build.gradle
|
|
||||||
+++ b/build.gradle
|
|
||||||
@@ -59,8 +59,7 @@ processResources {
|
|
||||||
}
|
|
||||||
|
|
||||||
jar.manifest.mainAttributes (
|
|
||||||
- "Built-By": System.properties['user.name'],
|
|
||||||
- "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")",
|
|
||||||
+ "Built-By": 'ReplayMod reprod',
|
|
||||||
"Implementation-Title": name,
|
|
||||||
"Implementation-Version": version
|
|
||||||
)
|
|
||||||
--
|
|
||||||
2.13.2
|
|
||||||
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
From 6b7ad7fd8c22384e62585a962e1bd74d6d003582 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jonas Herzig <me@johni0702.de>
|
|
||||||
Date: Sat, 2 Sep 2017 15:10:35 +0200
|
|
||||||
Subject: [PATCH] Disable license plugin
|
|
||||||
|
|
||||||
---
|
|
||||||
build.gradle | 18 ------------------
|
|
||||||
1 file changed, 18 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/build.gradle b/build.gradle
|
|
||||||
index 60ad57d..57aa5e4 100644
|
|
||||||
--- a/build.gradle
|
|
||||||
+++ b/build.gradle
|
|
||||||
@@ -5,13 +5,11 @@ buildscript {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dependencies {
|
|
||||||
- classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
|
|
||||||
classpath "com.gradle.publish:plugin-publish-plugin:0.9.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'groovy'
|
|
||||||
-apply plugin: 'license'
|
|
||||||
apply plugin: 'maven'
|
|
||||||
apply plugin: 'eclipse'
|
|
||||||
apply plugin: "com.gradle.plugin-publish"
|
|
||||||
@@ -42,22 +40,6 @@ processResources {
|
|
||||||
from 'LICENSE.txt'
|
|
||||||
}
|
|
||||||
|
|
||||||
-license {
|
|
||||||
- ext {
|
|
||||||
- name = project.name
|
|
||||||
- organization = project.organization
|
|
||||||
- url = project.url
|
|
||||||
- }
|
|
||||||
- include '**/*.groovy'
|
|
||||||
- header file("HEADER.txt")
|
|
||||||
- sourceSets = project.sourceSets
|
|
||||||
- ignoreFailures false
|
|
||||||
- strictCheck true
|
|
||||||
- mapping {
|
|
||||||
- java = 'SLASHSTAR_STYLE'
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
jar.manifest.mainAttributes (
|
|
||||||
"Built-By": 'ReplayMod reprod',
|
|
||||||
"Implementation-Title": name,
|
|
||||||
--
|
|
||||||
2.9.5
|
|
||||||
|
|
||||||
@@ -11,7 +11,7 @@ diff --git a/build.gradle b/build.gradle
|
|||||||
index ee24828..42d0607 100755
|
index ee24828..42d0607 100755
|
||||||
--- a/build.gradle
|
--- a/build.gradle
|
||||||
+++ b/build.gradle
|
+++ b/build.gradle
|
||||||
@@ -1,24 +1,17 @@
|
@@ -1,21 +1,18 @@
|
||||||
import groovy.json.JsonOutput
|
import groovy.json.JsonOutput
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
@@ -20,22 +20,18 @@ index ee24828..42d0607 100755
|
|||||||
- maven {
|
- maven {
|
||||||
- name = "forge"
|
- name = "forge"
|
||||||
- url = "http://files.minecraftforge.net/maven"
|
- url = "http://files.minecraftforge.net/maven"
|
||||||
- }
|
|
||||||
- maven {
|
|
||||||
- name = "sponge"
|
|
||||||
- url = "https://repo.spongepowered.org/maven"
|
|
||||||
- }
|
- }
|
||||||
maven {
|
maven {
|
||||||
name = "sonatype"
|
name = "sonatype"
|
||||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||||
}
|
}
|
||||||
|
maven { url 'https://jitpack.io' }
|
||||||
+ maven { url 'gradle/reprod/deps/repo' }
|
+ maven { url 'gradle/reprod/deps/repo' }
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
- classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
|
- classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
|
||||||
- classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
|
|
||||||
+ classpath 'reprod:forgegradle:0'
|
+ classpath 'reprod:forgegradle:0'
|
||||||
+ classpath 'reprod:mixingradle:0'
|
classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -108,7 +108,6 @@ setup_dep "mcinjector" "https://github.com/ModCoderPack/MCInjector.git" "7258466
|
|||||||
setup_dep "srg2source" "https://github.com/MinecraftForge/Srg2Source.git" "ea4ea624672e8b75fb2a78f0fb9105db13d5a4a6" "build/libs/Srg2Source-4.0-SNAPSHOT.jar" "727445a7b946535217be658726c537acf1921f0a9e2ac0ea717dff9b36dc529f" "4ebd7b738f368ee5c25a1028a167257e7012cef7c72c8b5b06149286992c631e"
|
setup_dep "srg2source" "https://github.com/MinecraftForge/Srg2Source.git" "ea4ea624672e8b75fb2a78f0fb9105db13d5a4a6" "build/libs/Srg2Source-4.0-SNAPSHOT.jar" "727445a7b946535217be658726c537acf1921f0a9e2ac0ea717dff9b36dc529f" "4ebd7b738f368ee5c25a1028a167257e7012cef7c72c8b5b06149286992c631e"
|
||||||
|
|
||||||
# Required for RM
|
# Required for RM
|
||||||
setup_dep "mixingradle" "https://github.com/SpongePowered/MixinGradle.git" "52217aa8ca221dcd0b9fb657b037e663db808f38" "build/libs/mixingradle-0.4-SNAPSHOT.jar" "8b3508867128a5d564631635dff898a36f9aca8db54b7bb3af6f4924e3f4bead" "42cbf81136d4e26c06d3234427665b50d18768cc1f210512204ca1d5e3a42b5c"
|
|
||||||
setup_dep "forgegradle" "https://github.com/MinecraftForge/ForgeGradle.git" "f49079dd11c037f74cc740285b2c5504fbf8a7f6" "build/libs/ForgeGradle-2.3-SNAPSHOT.jar" "8272cf68ae269c315969e3e94a41bdffe1cf96cfbc6d701cafda90ab19ef5f94" "9261c0855a19d86434c6f9e784265d91e3e3c9f12b29dd90f41efacd15add41e"
|
setup_dep "forgegradle" "https://github.com/MinecraftForge/ForgeGradle.git" "f49079dd11c037f74cc740285b2c5504fbf8a7f6" "build/libs/ForgeGradle-2.3-SNAPSHOT.jar" "8272cf68ae269c315969e3e94a41bdffe1cf96cfbc6d701cafda90ab19ef5f94" "9261c0855a19d86434c6f9e784265d91e3e3c9f12b29dd90f41efacd15add41e"
|
||||||
|
|
||||||
rm -rf tmp
|
rm -rf tmp
|
||||||
|
|||||||
Reference in New Issue
Block a user