diff options
| -rw-r--r-- | GuiTest/build.gradle | 34 | ||||
| -rw-r--r-- | GuiTest/gradle.properties | 17 | ||||
| -rw-r--r-- | GuiTest/settings.gradle | 13 | ||||
| -rw-r--r-- | build.gradle | 32 | ||||
| -rw-r--r-- | gradle.properties | 1 | ||||
| -rw-r--r-- | settings.gradle | 4 |
6 files changed, 19 insertions, 82 deletions
diff --git a/GuiTest/build.gradle b/GuiTest/build.gradle index 9609abd..982df0b 100644 --- a/GuiTest/build.gradle +++ b/GuiTest/build.gradle @@ -1,23 +1,17 @@ -buildscript { - repositories { - jcenter() - } -} - plugins { - id 'fabric-loom' version '0.2.7-SNAPSHOT' + id 'fabric-loom' } sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 if(rootProject.file('private.gradle').exists()) { //Publishing details - apply from: 'private.gradle' + apply from: rootProject.file('private.gradle') } -archivesBaseName = project.archives_base_name -version = project.mod_version -group = project.maven_group +archivesBaseName = "LibGuiTest" +version = rootProject.version +group = rootProject.group minecraft { } @@ -32,21 +26,15 @@ repositories { } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}" - modApi "net.fabricmc:fabric-loader:${project.loader_version}" - modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modApi "io.github.cottonmc:Jankson-Fabric:${project.jankson_version}" - include "io.github.cottonmc:Jankson-Fabric:${project.jankson_version}" + minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" + mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}" + modApi "net.fabricmc:fabric-loader:${rootProject.loader_version}" + modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}" compileOnly ("com.google.code.findbugs:jsr305:3.0.2") { transitive = false } - - //modApi ("io.github.prospector:modmenu:1.7.10-unstable.19w35a+build.2")// { transitive = false } - modCompileOnly "io.github.prospector:modmenu:1.7.10-unstable.19w35a+build.2" - //modApi ("io.github.cottonmc:LibGui:1.3.1-SNAPSHOT") { changing = true } - compile (project(":LibGUI")) { transitive = false }; - runtime (project(":LibGUI")) { transitive = false }; + implementation project(':') + modRuntime "io.github.prospector:modmenu:$rootProject.modmenu_version" // for testing } processResources { diff --git a/GuiTest/gradle.properties b/GuiTest/gradle.properties deleted file mode 100644 index b1db372..0000000 --- a/GuiTest/gradle.properties +++ /dev/null @@ -1,17 +0,0 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G - -# Fabric Properties - # check these on https://fabricmc.net/use - minecraft_version=20w17a - yarn_mappings=20w17a+build.4 - loader_version=0.8.2+build.194 - -# Mod Properties - mod_version = 1.9.0 - maven_group = io.github.cottonmc - archives_base_name = LibGui - -# Dependencies - fabric_version=0.6.2+build.327-1.16 - jankson_version=2.0.1+j1.2.0 diff --git a/GuiTest/settings.gradle b/GuiTest/settings.gradle deleted file mode 100644 index 55a4710..0000000 --- a/GuiTest/settings.gradle +++ /dev/null @@ -1,13 +0,0 @@ -pluginManagement { - repositories { - jcenter() - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } -} - -include ":LibGUI" -project(":LibGUI").projectDir = file("../")
\ No newline at end of file diff --git a/build.gradle b/build.gradle index 3d0e1db..ab52414 100644 --- a/build.gradle +++ b/build.gradle @@ -1,34 +1,9 @@ -buildscript { - repositories { - jcenter() - maven { - name = 'Modmuss' - url = 'https://maven.modmuss50.me/' - } - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - } - - dependencies { - System.out.println(rootProject.name); - if (rootProject.name.equalsIgnoreCase("LibGUI")) { - System.out.println("Added libgui to classpath"); - classpath 'fabric-loom:fabric-loom.gradle.plugin:0.2.7-SNAPSHOT' - } - } -} - plugins { - //id 'fabric-loom' version '0.2.4-SNAPSHOT' + id 'fabric-loom' version '0.2.7-SNAPSHOT' id 'maven-publish' id "com.jfrog.artifactory" version "4.9.0" } - -apply plugin: "fabric-loom"; - sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -59,9 +34,8 @@ dependencies { compileOnly ("com.google.code.findbugs:jsr305:3.0.2") { transitive = false } - def modmenu = "1.11.0+build.2" - modCompileOnly "io.github.prospector:modmenu:$modmenu" - modRuntime "io.github.prospector:modmenu:$modmenu" // for testing + modCompileOnly "io.github.prospector:modmenu:$project.modmenu_version" + modRuntime "io.github.prospector:modmenu:$project.modmenu_version" // for testing } processResources { diff --git a/gradle.properties b/gradle.properties index e4903dc..2f99a27 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx1G # Dependencies fabric_version=0.10.9+build.346-1.16 jankson_version=2.1.0+j1.2.0 + modmenu_version=1.11.0+build.2 diff --git a/settings.gradle b/settings.gradle index 5b60df3..36fe377 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,3 +8,7 @@ pluginManagement { gradlePluginPortal() } } + +rootProject.name = 'LibGui' + +include ':GuiTest' |