diff --git a/.github/workflows/Android-CI-Espresso.yml b/.github/workflows/Android-CI-Espresso.yml index 6d71a331..50839788 100644 --- a/.github/workflows/Android-CI-Espresso.yml +++ b/.github/workflows/Android-CI-Espresso.yml @@ -15,8 +15,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ macOS-13 ] - api: [ 28 ] + os: [ ubuntu-22.04 ] + api: [ 34 ] abi: [ x86_64 ] tag: [ 'default' ] java_version: [ 17 ] @@ -36,6 +36,17 @@ jobs: with: distribution: 'adopt' java-version: ${{ matrix.java_version }} + - name: kvm support + run: | + egrep -c '(vmx|svm)' /proc/cpuinfo + id + sudo adduser $USER kvm + sudo chown -R $USER /dev/kvm + id + - name: prepare + run: | + sudo apt-get update && sudo apt-get install -y exiftool imagemagick xdg-utils libimage-exiftool-perl zsh jq xorg + # brew install exiftool imagemagick - uses: gradle/wrapper-validation-action@v3 - name: Install Android SDK uses: hannesa2/action-android/install-sdk@0.1.16.7 @@ -45,8 +56,8 @@ jobs: CRYPT_PASS: ${{ secrets.CRYPT_PASS }} - name: Build project run: ./gradlew assembleDebug - - name: Run tests - run: ./gradlew test + - name: Test publish to jitpack.io + run: ./gradlew :LogcatCoreLib:assembleRelease :LogcatCoreLib:publishToMavenLocal :LogcatCoreUI:assembleRelease :LogcatCoreUI:publishToMavenLocal :LogcatCrashlyticLib:assembleRelease :LogcatCrashlyticLib:publishToMavenLocal :LogcatCountlyLib:assembleRelease :LogcatCountlyLib:publishToMavenLocal - name: Run instrumentation tests uses: hannesa2/action-android/emulator-run-cmd@0.1.16.7 with: diff --git a/LogcatCoreLib/build.gradle b/LogcatCoreLib/build.gradle index 67c3ef4d..990f2b82 100644 --- a/LogcatCoreLib/build.gradle +++ b/LogcatCoreLib/build.gradle @@ -11,6 +11,7 @@ android { minSdkVersion 21 project.archivesBaseName = "LogcatCore" + consumerProguardFiles "consumer.pro" } namespace 'info.hannes.logcat' compileOptions { diff --git a/LogcatCoreLib/consumer.pro b/LogcatCoreLib/consumer.pro new file mode 100644 index 00000000..8d744002 --- /dev/null +++ b/LogcatCoreLib/consumer.pro @@ -0,0 +1,5 @@ +# Keep source file names and line numbers for better stack traces +-keepattributes SourceFile,LineNumberTable + +# Optional: Keep parameter names for better debugging +-keepattributes MethodParameters \ No newline at end of file