From 7da08689137d356e81585cbb6f970b2dd840e5e3 Mon Sep 17 00:00:00 2001 From: The Color Blurple Date: Sat, 27 Apr 2024 21:15:40 -0400 Subject: [PATCH] Jitpack Fix number 9 --- basemod/build.gradle | 2 +- build.gradle | 64 ++++++++++++++++++++--------------------- examplemod/build.gradle | 2 +- settings.gradle | 2 +- 4 files changed, 34 insertions(+), 36 deletions(-) diff --git a/basemod/build.gradle b/basemod/build.gradle index 7d1faf2..9dd191a 100644 --- a/basemod/build.gradle +++ b/basemod/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.9' // 1D6 - implementation 'com.github.GirlInPurple:onedsix:master-SNAPSHOT' + //implementation 'com.github.GirlInPurple:onedsix:master-SNAPSHOT' // LibGDX implementation "com.badlogicgames.gdx:gdx:$gdxVersion" diff --git a/build.gradle b/build.gradle index 4668750..6becbf9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - if (!System.env.JITPACK) { + //if (!System.env.JITPACK) { repositories { mavenLocal() @@ -14,7 +14,7 @@ buildscript { classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.20' } - } + //} } allprojects { @@ -42,40 +42,33 @@ allprojects { } } -if (!System.env.JITPACK) { - project(":android") { - apply plugin: "com.android.application" - - configurations { natives } +project(":android") { + apply plugin: "com.android.application" - dependencies { - implementation project(":core") - api "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" - natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a" - natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a" - natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86" - natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64" - api "com.badlogicgames.gdx:gdx-ai:$aiVersion" - api "com.badlogicgames.ashley:ashley:$ashleyVersion" - api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion" - api "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" - natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a" - natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a" - natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86" - natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64" - api "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion" - api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi-v7a" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-arm64-v8a" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86_64" + configurations { natives } - } - } + dependencies { + implementation project(":core") + api "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" + natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a" + natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a" + natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86" + natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64" + api "com.badlogicgames.gdx:gdx-ai:$aiVersion" + api "com.badlogicgames.ashley:ashley:$ashleyVersion" + api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion" + api "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64" + api "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion" + api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion" + natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi-v7a" + natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-arm64-v8a" + natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86" + natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86_64" - project(":examplemod") { - apply plugin: "java-library" - // Look inside ExampleMod's specific build.gradle for more info } } @@ -135,6 +128,11 @@ project(":desktop") { } } +project(":examplemod") { + apply plugin: "java-library" + // Look inside ExampleMod's specific build.gradle for more info +} + project(":server") { apply plugin: "java-library" diff --git a/examplemod/build.gradle b/examplemod/build.gradle index 2747c73..0cc976d 100644 --- a/examplemod/build.gradle +++ b/examplemod/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation "ch.qos.logback:logback-classic:1.2.6" // 1D6 - implementation "com.github.GirlInPurple:onedsix:-SNAPSHOT" + //implementation "com.github.GirlInPurple:onedsix:master-SNAPSHOT" // LibGDX api "com.badlogicgames.gdx:gdx:$gdxVersion" diff --git a/settings.gradle b/settings.gradle index 94cdc50..ef2b1f1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,9 @@ -include 'basemod' // Official Base Mod include 'core' // Core, everything depends on it include 'desktop' // Windows/Linux/Mac include 'server' // Server Software if (!System.env.JITPACK) { include 'android' // Android/Mobile + include 'basemod' // Official Base Mod include 'examplemod' // Example Mod } \ No newline at end of file