Merge remote-tracking branch 'origin/stable' into stable

SkidderMC · Aug 18, 2023 · 5e1c318 · 5e1c318
2 parents 23678a4 + 4e2bacf
commit 5e1c318
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -21,9 +21,9 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew app:assembleRelease
+      run: ./gradlew app:assembleDebug
     - name: Upload build artifacts
       uses: actions/upload-artifact@v2
       with:
         name: ProtoHax-build-${{ github.sha }}
-        path: ./app/build/outputs/apk/release/app-release.apk
+        path: ./app/build/outputs/apk/debug/app-debug.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
             keyAlias 'sora'
             keyPassword '1145141919'
             storePassword '1145141919'
-
+ 
             enableV1Signing true
             enableV2Signing true
             enableV3Signing true
@@ -79,7 +79,7 @@ android {
 }
 
 dependencies {
-    implementation('dev.sora.relay:protohax:+') {
+    implementation('dev.sora.relay:protohax:1.4.0') {
         transitive = false
     }
     implementation 'dev.sora.networking:libmitm:1.2.3-raknet'

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         compose_compiler_version = '1.4.8'
         compose_material_version = '1.1.1'
         accompanist_version = '0.28.0'
-    }
+    } 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.0.2'
         classpath 'com.google.gms:google-services:4.3.15'

diff --git a/settings.gradle b/settings.gradle
@@ -9,16 +9,9 @@ dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         mavenLocal()
-        maven { url = 'https://repo.genshit.xyz/maven_repo/' }
+        maven { url = 'https://raw.githubusercontent.com/SkidderMC/ProtoHax-PackageGit/main/maven_repo/' }
         google()
         mavenCentral()
-        maven {
-            url = 'https://maven.pkg.github.com/SkidderMC/ProtoHax'
-            credentials {
-                username = System.getenv("USERNAME_GITHUB")
-                password = System.getenv("TOKEN_GITHUB")
-            }
-        }
     }
 }
 rootProject.name = 'ProtoHax-Android'