From 9c76a2f03d44465f5caa9f498397227484da9880 Mon Sep 17 00:00:00 2001 From: Spikatrix <12792882+Spikatrix@users.noreply.github.com> Date: Sat, 7 Feb 2026 21:12:34 +0530 Subject: [PATCH 1/4] gradle 8.5 + java 21 --- .github/workflows/build.yml | 6 +++--- app/build.gradle | 15 +++++++++------ build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e6922b..5c88163 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build on: push: - branches: ["master"] + branches: ["master", "gradle-upgrade"] pull_request: branches: ["master"] workflow_dispatch: @@ -14,10 +14,10 @@ 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 diff --git a/app/build.gradle b/app/build.gradle index 5193d0c..ae5be98 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,14 @@ 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/*' + } } } diff --git a/build.gradle b/build.gradle index 60836db..ac235a7 100644 --- a/build.gradle +++ b/build.gradle @@ -3,12 +3,12 @@ buildscript { repositories { google() - jcenter() + mavenCentral() maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:8.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -18,7 +18,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven { url "https://jitpack.io" } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..2bbac7d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file From 1ecb0e4d6b79808c0b5462e4a11b975df89a975e Mon Sep 17 00:00:00 2001 From: Spikatrix <12792882+Spikatrix@users.noreply.github.com> Date: Sat, 7 Feb 2026 21:22:10 +0530 Subject: [PATCH 2/4] enable build config --- app/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index ae5be98..ad3e351 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,6 +52,10 @@ android { excludes += 'META-INF/*' } } + + buildFeatures { + buildConfig true + } } dependencies { From 78e22d6ea37ecd6c4a60ff8bce4fa7edbe7f0106 Mon Sep 17 00:00:00 2001 From: Spikatrix <12792882+Spikatrix@users.noreply.github.com> Date: Sat, 7 Feb 2026 21:26:00 +0530 Subject: [PATCH 3/4] cleanups --- .github/workflows/build.yml | 1 - app/src/main/AndroidManifest.xml | 3 +-- app/src/playstore/AndroidManifest.xml | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c88163..d0a4045 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,6 @@ jobs: - 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/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 @@ - + Date: Sat, 7 Feb 2026 23:52:18 +0530 Subject: [PATCH 4/4] revert test build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0a4045..c0c6443 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build on: push: - branches: ["master", "gradle-upgrade"] + branches: ["master"] pull_request: branches: ["master"] workflow_dispatch: