diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e6922b..c0c6443 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,16 +14,15 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Set up JDK 8 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: 8 + java-version: 21 distribution: 'zulu' - name: Set up Android SDK uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 8512546 log-accepted-android-sdk-licenses: false - name: Make gradlew executable diff --git a/app/build.gradle b/app/build.gradle index 5193d0c..ad3e351 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,9 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + namespace "com.cg.lrceditor" + compileSdkVersion 34 + buildToolsVersion "34.0.0" defaultConfig { applicationId "com.cg.lrceditor" @@ -42,12 +43,18 @@ android { compileOptions { encoding = 'UTF-8' - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } - packagingOptions { - exclude 'META-INF/*' + packaging { + resources { + excludes += 'META-INF/*' + } + } + + buildFeatures { + buildConfig true } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7874419..fd6054b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/app/src/playstore/AndroidManifest.xml b/app/src/playstore/AndroidManifest.xml index 5ef38cd..52e5aff 100644 --- a/app/src/playstore/AndroidManifest.xml +++ b/app/src/playstore/AndroidManifest.xml @@ -1,6 +1,5 @@ - +