use rhino maintained by ourselves

5ec1cff · Sep 9, 2023 · 222f709 · 222f709
1 parent bed34be
commit 222f709
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ jobs:
         with:
           submodules: "recursive"
           fetch-depth: 0
+          path: StethoX
 
       - name: Write key
         if: ${{ ( github.event_name != 'pull_request' && github.ref == 'refs/heads/master' ) || github.ref_type == 'tag' }}
@@ -35,6 +36,12 @@ jobs:
             echo ${{ secrets.KEY_STORE }} | base64 --decode > key.jks
           fi
 
+      - name: Checkout rhino
+        uses: actions/checkout@v3
+        with:
+          repository: 5ec1cff/rhino
+          path: rhino
+
       - name: Checkout stetho
         uses: actions/checkout@v3
         with:
@@ -52,7 +59,16 @@ jobs:
         with:
           gradle-home-cache-cleanup: true
 
-      - name: Build dependencies
+      - name: Build rhino
+        working-directory: rhino
+        run: |
+          echo 'org.gradle.caching=true' >> ~/.gradle/gradle.properties
+          echo 'org.gradle.parallel=true' >> ~/.gradle/gradle.properties
+          echo 'org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC' >> ~/.gradle/gradle.properties
+          echo 'android.native.buildOutput=verbose' >> ~/.gradle/gradle.properties
+          ./gradlew publishToMavenLocal
+
+      - name: Build stetho
         working-directory: stetho
         run: |
           echo 'org.gradle.caching=true' >> ~/.gradle/gradle.properties
@@ -62,17 +78,18 @@ jobs:
           ./gradlew publishToMavenLocal
 
       - name: Build with Gradle
+        working-directory: StethoX
         run: |
           ./gradlew assemble
 
       - name: Upload release
         uses: actions/upload-artifact@v3
         with:
           name: "StethoX-release-ci.apk"
-          path: "./app/build/outputs/apk/release/app-release.apk"
+          path: "./StethoX/app/build/outputs/apk/release/app-release.apk"
 
       - name: Upload debug
         uses: actions/upload-artifact@v3
         with:
           name: "StethoX-debug-ci.apk"
-          path: "./app/build/outputs/apk/debug/app-debug.apk"
+          path: "./StethoX/app/build/outputs/apk/debug/app-debug.apk"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -67,5 +67,5 @@ dependencies {
     compileOnly(project(":hidden-api"))
     implementation("com.github.5ec1cff.stetho:stetho:1.0-alpha-1")
     implementation("com.github.5ec1cff.stetho:stetho-js-rhino:1.0-alpha-1")
-    implementation("org.mozilla:rhino:1.7.13")
+    implementation("org.mozilla:rhino:1.7.15-SNAPSHOT")
 }