stuff

Weathercold · Dec 29, 2022 · 930c2d1 · 930c2d1
1 parent 4dd92de
commit 930c2d1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/.github/workflows/commitTest.yml b/.github/workflows/commitTest.yml
@@ -7,18 +7,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up PATH
-      run: |
-        echo "${ANDROID_HOME}/build-tools/30.0.1" >> $GITHUB_PATH
-    - name: Set up JDK 17
-      uses: actions/setup-java@v1
-      with:
-        java-version: 17
-    - name: Build mod jar
-      run: ./gradlew deploy
-    - name: Upload built jar file
-      uses: actions/upload-artifact@v2
-      with:
-        name: ${{ github.event.repository.name }}
-        path: build/libs/${{ github.event.repository.name }}.jar
+      - uses: actions/checkout@v2
+      - name: Set up PATH
+        run: |
+          echo "${ANDROID_HOME}/build-tools/30.0.1" >> $GITHUB_PATH
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+      - name: Build mod jar
+        run: ./gradlew deploy
+      - name: Upload built jar file
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.event.repository.name }}
+          path: build/libs/${{ github.event.repository.name }}.jar
diff --git a/build.gradle b/build.gradle
@@ -34,15 +34,6 @@ dependencies{
     annotationProcessor "com.github.Anuken:jabel:$jabelVersion"
 }
 
-//force arc version
-configurations.all{
-    resolutionStrategy.eachDependency { details ->
-        if(details.requested.group == 'com.github.Anuken.Arc'){
-            details.useVersion "$mindustryVersion"
-        }
-    }
-}
-
 task jarAndroid{
     dependsOn "jar"
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=--illegal-access=permit \
+org.gradle.jvmargs = --illegal-access=permit \
 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
 --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
 --add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
@@ -11,5 +11,5 @@ org.gradle.jvmargs=--illegal-access=permit \
 --add-exports=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
 --add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
 --add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED
-systemProp.org.gradle.internal.http.connectionTimeout=180000
-systemProp.org.gradle.internal.http.socketTimeout=180000
+systemProp.org.gradle.internal.http.connectionTimeout = 180000
+systemProp.org.gradle.internal.http.socketTimeout = 180000