Jitpack Fix number 9

GirlInPurple · Apr 28, 2024 · 7da0868 · 7da0868
1 parent 7744316
commit 7da0868
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
 }