diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 0c6e4c01..b77a42ec 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.5.2 - name: set up JDK 11 uses: actions/setup-java@v3 with: @@ -31,15 +31,6 @@ jobs: - name: Build with Gradle run: ./gradlew assembleEmulatorRelease - - name: rename - run: | - filenames=`ls app/build/outputs/apk/emulator/release/*.apk` - for eachfile in $filenames - do - newpath=${eachfile%.*}; - mv $eachfile ${newpath%-*}.apk - done - - name: Path lister action uses: Rishabh510/Path-lister-action@1.0 id: pl @@ -54,6 +45,40 @@ jobs: msg: ${{ steps.pl.outputs.paths }} separator: ' ' + - name: list filenames + id: filenames + run: | + echo "name0=$(basename ${{ steps.split.outputs._0 }} .apk)" >> $GITHUB_OUTPUT + echo "name1=$(basename ${{ steps.split.outputs._1 }} .apk)" >> $GITHUB_OUTPUT + echo "name2=$(basename ${{ steps.split.outputs._2 }} .apk)" >> $GITHUB_OUTPUT + echo "name3=$(basename ${{ steps.split.outputs._3 }} .apk)" >> $GITHUB_OUTPUT + echo "name4=$(basename ${{ steps.split.outputs._4 }} .apk)" >> $GITHUB_OUTPUT + + - uses: actions/upload-artifact@v3 + with: + name: ${{ steps.filenames.outputs.name0 }} + path: ${{ steps.split.outputs._0 }} + + - uses: actions/upload-artifact@v3 + with: + name: ${{ steps.filenames.outputs.name1 }} + path: ${{ steps.split.outputs._1 }} + + - uses: actions/upload-artifact@v3 + with: + name: ${{ steps.filenames.outputs.name2 }} + path: ${{ steps.split.outputs._2 }} + + - uses: actions/upload-artifact@v3 + with: + name: ${{ steps.filenames.outputs.name3 }} + path: ${{ steps.split.outputs._3 }} + + - uses: actions/upload-artifact@v3 + with: + name: ${{ steps.filenames.outputs.name4 }} + path: ${{ steps.split.outputs._4 }} + - name: Upload a Build Artifact uses: actions/upload-artifact@v3 with: @@ -61,23 +86,3 @@ jobs: path: | app/build/outputs/mapping app/build/outputs/native-debug-symbols - - - name: Get version - id: get_version - run: | - msg=$(git log -1 --pretty=format:"%s") - echo "::set-output name=version::${msg#* }" - - - name: Draft GitHub Release - uses: "marvinpinto/action-automatic-releases@latest" - with: - repo_token: "${{ secrets.REPO_TOKEN }}" - automatic_release_tag: ${{ steps.get_version.outputs.version }} - prerelease: true - draft: true - files: | - ${{ steps.split.outputs._0 }} - ${{ steps.split.outputs._1 }} - ${{ steps.split.outputs._2 }} - ${{ steps.split.outputs._3 }} - ${{ steps.split.outputs._4 }} diff --git a/app/build.gradle b/app/build.gradle index 2550d137..ba0e7eb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "ru.woesss.j2meloader" minSdk MIN_SDK targetSdk TARGET_SDK - versionCode 35 - versionName "0.83" + versionCode 36 + versionName "0.83.SF" resValue 'string', 'app_name', rootProject.name vectorDrawables.useSupportLibrary = true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/ru/playsoftware/j2meloader/EmulatorApplication.java b/app/src/main/java/ru/playsoftware/j2meloader/EmulatorApplication.java index 4ce84af1..3ab39ead 100644 --- a/app/src/main/java/ru/playsoftware/j2meloader/EmulatorApplication.java +++ b/app/src/main/java/ru/playsoftware/j2meloader/EmulatorApplication.java @@ -70,7 +70,7 @@ protected void attachBaseContext(Context base) { .withEnabled(true) .build() )); - ACRA.getErrorReporter().setEnabled(isSignatureValid()); + ACRA.getErrorReporter().setEnabled(false); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); sp.registerOnSharedPreferenceChangeListener(themeListener); setNightMode(sp.getString(Constants.PREF_THEME, null));