fix conflicts

alibaba · Sep 23, 2023 · ca24675 · ca24675
2 parents e844f01 + fad261c
commit ca24675
Show file tree

Hide file tree

Showing 451 changed files with 7,558 additions and 4,816 deletions.
diff --git a/.github/workflows/android-test-case.yml b/.github/workflows/android-test-case.yml
@@ -0,0 +1,28 @@
+name: Android Unit Test CI
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ branches:
+ - main
+jobs:
+ build:
+
+ runs-on: macos-latest
+
+ steps:
+ - uses: actions/checkout@v3
+ - name: set up JDK 11
+ uses: actions/setup-java@v3
+ with:
+ java-version: '11'
+ distribution: 'temurin'
+ cache: gradle
+ - name: run tests
+ uses: reactivecircus/android-emulator-runner@v2
+ with:
+ api-level: 29
+ working-directory: ./GaiaXAndroid
+ script: ./gradlew connectedCheck && ./gradlew connectedAndroidTest
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -1,4 +1,4 @@
-name: Android CI
+name: Android publish CI
 
 on:
  push:

diff --git a/.gradle/6.7.1/fileChanges/last-build.bin b/.gradle/6.7.1/fileChanges/last-build.bin
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.lock b/.gradle/6.7.1/fileHashes/fileHashes.lock
diff --git a/...ickJS/quickjs/quickjs/test262o_errors.txt → .gradle/6.7.1/gc.properties b/...ickJS/quickjs/quickjs/test262o_errors.txt → .gradle/6.7.1/gc.properties
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/configuration-cache/gc.properties b/.gradle/configuration-cache/gc.properties
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
diff --git a/GaiaX-Android-QuickJS/.classpath b/GaiaX-Android-QuickJS/.classpath
diff --git a/GaiaX-Android-QuickJS/.gitignore b/GaiaX-Android-QuickJS/.gitignore
diff --git a/GaiaX-Android-QuickJS/.gitmodules b/GaiaX-Android-QuickJS/.gitmodules
diff --git a/GaiaX-Android-QuickJS/.project b/GaiaX-Android-QuickJS/.project
diff --git a/GaiaX-Android-QuickJS/gradle.properties b/GaiaX-Android-QuickJS/gradle.properties
diff --git a/GaiaXAnalyze/GXAnalyzeAndroid/build.gradle b/GaiaXAnalyze/GXAnalyzeAndroid/build.gradle
@@ -6,9 +6,8 @@ allprojects {
  repositories {
  mavenLocal()
  google()
- maven { url "https://jitpack.io" }
  mavenCentral()
- maven { url 'https://mvnrepository.com/artifact/com.github.gundy/semver4j' }
+ maven { url "https://jitpack.io" }
  }
 }
 
@@ -19,9 +18,8 @@ buildscript {
  repositories {
  mavenLocal()
  google()
- maven { url "https://jitpack.io" }
  mavenCentral()
- maven { url 'https://mvnrepository.com/artifact/com.github.gundy/semver4j' }
+ maven { url "https://jitpack.io" }
  }
 
  dependencies {
@@ -52,11 +50,6 @@ android {
  '-DANDROID_STL=c++_shared'
  }
  }
-
- ndk {
- // support all abi armeabi-v7a arm64-v8a x86 x86_64
- // abiFilters 'armeabi-v7a', 'arm64-v8a'
- }
  }
 
  sourceSets {
@@ -109,15 +102,19 @@ android {
  jvmTarget = '1.8'
  }
 
+ lintOptions {
+ abortOnError false
+ }
+
  buildTypes {
  debug {
  ndk {
- abiFilters "x86", 'armeabi-v7a', 'arm64-v8a'
+ abiFilters "x86", "x86_64", 'armeabi-v7a', 'arm64-v8a'
  }
  }
  release {
  ndk {
- abiFilters "x86", 'armeabi-v7a', 'arm64-v8a'
+ abiFilters 'armeabi-v7a', 'arm64-v8a'
  }
  }
  }