From 928248f24f86370bdcbab0c328d812762a3a2d75 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Sat, 16 Dec 2023 04:29:11 +0800
Subject: [PATCH] Fix mac sed

https://stackoverflow.com/questions/12272065
---
 .github/workflows/android.yml | 10 +++++-----
 settings.gradle               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6ae2777..2299046 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -27,7 +27,7 @@ jobs:
           echo 'org.gradle.caching=true' >> gradle.properties
           echo 'org.gradle.parallel=true' >> gradle.properties
           echo '84831b9409646a918e30573bab4c9c91346d8abd' > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license
-          sed -i 's?return X509_CERT_DIR;?return "/system/etc/security/cacerts";?' boringssl/src/main/native/src/crypto/x509/x509_def.c
+          sed -i '' 's?return X509_CERT_DIR;?return "/system/etc/security/cacerts";?' boringssl/src/main/native/src/crypto/x509/x509_def.c
       - name: Build with Gradle
         run: |
           ./gradlew :b:publishToMavenLocal
@@ -35,15 +35,15 @@ jobs:
       - name: Test with Gradle
         run: |
           ./gradlew :a:allDevicesDebugAndroidTest
-          ls -l app/build/outputs/androidTest-results/managedDevice/atd64bit/testlog
-          rm -v app/build/outputs/androidTest-results/managedDevice/*/testlog/adb.additional_test_output*
+          ls -l app/build/outputs/androidTest-results/managedDevice/debug/atd64bit/testlog
+          rm -v app/build/outputs/androidTest-results/managedDevice/*/*/testlog/adb.additional_test_output*
       - name: Upload app
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: app
           path: app/build/outputs
       - name: Upload library
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: library
           path: ~/.m2
diff --git a/settings.gradle b/settings.gradle
index 07948f9..cebdb7d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,8 +14,8 @@ dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
-        mavenLocal()
         mavenCentral()
+        mavenLocal()
     }
 }
 include ':boringssl'