From cfb990ad43f7f24ee5a677b0c656f936de41f792 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Fri, 1 Sep 2017 18:15:06 +0200 Subject: [PATCH] Remove ReplayStudio submodule and depend on it via maven instead --- .gitmodules | 4 ---- ReplayStudio | 1 - build.gradle | 7 ++----- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 160000 ReplayStudio diff --git a/.gitmodules b/.gitmodules index ea042fed..0d1b3611 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,6 @@ path = jGui url = https://github.com/ReplayMod/jGui -[submodule "ReplayStudio"] - path = ReplayStudio - url = https://github.com/ReplayMod/ReplayStudio - [submodule "src/main/resources/assets/replaymod/lang"] path = src/main/resources/assets/replaymod/lang url = https://github.com/ReplayMod/Translations diff --git a/ReplayStudio b/ReplayStudio deleted file mode 160000 index f1d6fbbf..00000000 --- a/ReplayStudio +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f1d6fbbf8a465de4245d5f1dcafe8ffdcfbfd044 diff --git a/build.gradle b/build.gradle index 4576ecbc..7ec7201b 100755 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,7 @@ repositories { name = "SpongePowered Repo" url = "http://repo.spongepowered.org/maven/" } + maven { url 'https://jitpack.io' } } configurations { @@ -70,24 +71,20 @@ dependencies { shade 'org.aspectj:aspectjrt:1.8.2' - compile project(':ReplayStudio') + shade 'com.github.replaymod:ReplayStudio:f1d6fbb' testCompile 'junit:junit:4.11' } -tasks['idea'].dependsOn ':ReplayStudio:preshadowJar' - jar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE dependsOn configurations.compile dependsOn configurations.shade - dependsOn ':ReplayStudio:shadowJar' def shade = {files( configurations.compile.findAll {it.name.startsWith 'mixin-'} + configurations.shade - + getTasks().getByPath(':ReplayStudio:shadowJar').outputs.files )} def noticeDir = file("$buildDir/NOTICE")