From b95a8421316bca89000f33f248379367a0441718 Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Wed, 22 Feb 2023 12:26:52 -0500 Subject: [PATCH] more bugfixes Signed-off-by: androidacy-user --- .github/workflows/build-debug.yml | 6 +++--- app/build.gradle | 6 +++--- app/proguard-rules.pro | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index e59c063..e4ebb29 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -27,10 +27,10 @@ jobs: with: submodules: true - - name: Set up Java 11 + - name: Set up Java 17 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'adopt' cache: gradle @@ -47,7 +47,7 @@ jobs: run: ./gradlew app:assembleFdroidDebug # UPLOAD ARTIFACT SECTION - # Will be shortner, when https://github.com/actions/upload-artifact/pull/354 will be merged + # Will be shorter, when https://github.com/actions/upload-artifact/pull/354 will be merged # FoxMMM-default-debug - name: Upload FoxMMM-default-arm64-v8a-debug uses: actions/upload-artifact@v3 diff --git a/app/build.gradle b/app/build.gradle index 53a6f5b..9090b9b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,8 @@ import io.sentry.android.gradle.extensions.InstrumentationFeature + plugins { // Gradle doesn't allow conditionally enabling/disabling plugins - id "io.sentry.android.gradle" version "3.4.1" + id "io.sentry.android.gradle" version "3.4.2" id 'com.android.application' id 'com.mikepenz.aboutlibraries.plugin' id 'org.jetbrains.kotlin.android' @@ -375,14 +376,13 @@ android { } kotlinOptions { - jvmTarget=JavaVersion.VERSION_17 + jvmTarget = JavaVersion.VERSION_17 } //noinspection GrDeprecatedAPIUsage buildToolsVersion '33.0.1' } - kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(17)) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 1816a95..75b4292 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -190,7 +190,6 @@ # Keep all of Cronet API and google's internal classes -keep class org.chromium.net.** { *; } -keep class org.chromium.** { *; } --keep class com.google.** { *; } # Silence some warnings -dontwarn android.os.SystemProperties