Merge remote-tracking branch 'upstream/master'

hiddify · Mar 19, 2024 · ebf04e5 · ebf04e5
2 parents a49a1b3 + f286506
commit ebf04e5
Show file tree

Hide file tree

Showing 50 changed files with 1,727 additions and 775 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,16 +15,16 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
 
     - name: Setup Golang
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.21.4'
 
@@ -35,7 +35,7 @@ jobs:
 
 
     - name: Setup Android environment
-      uses: android-actions/setup-android@v2
+      uses: android-actions/setup-android@v3
 
 
     - name: Build dependencies
@@ -58,7 +58,7 @@ jobs:
         ./gradlew assembleDebug
 
     - name: Upload APK
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: apk
         path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/
diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle