From d683be08125d2e7232273626690ebec758b574b6 Mon Sep 17 00:00:00 2001 From: Artem Zhiganov Date: Sat, 23 Sep 2023 16:46:25 +0700 Subject: [PATCH] Update Gradle Plugin 3.3.2 -> 8.1.1 AGP 8.0 Builds and runs successfully #1 Co-authored-by: SVolf --- app/llx/app/build.gradle | 8 +++++++- app/llx/app/src/main/AndroidManifest.xml | 3 +-- .../lightning_launcher/activities/AppDrawerX.java | 2 +- app/llx/build.gradle | 2 +- app/llx/core/build.gradle | 11 +++++------ app/llx/core/src/main/AndroidManifest.xml | 3 +-- app/llx/gradle.properties | 3 +++ app/llx/gradle/wrapper/gradle-wrapper.properties | 4 ++-- app/llx/plugin-api/build.gradle | 3 +-- app/llx/plugin-api/src/main/AndroidManifest.xml | 2 +- app/llx/wear/build.gradle | 10 +++++----- 11 files changed, 28 insertions(+), 23 deletions(-) diff --git a/app/llx/app/build.gradle b/app/llx/app/build.gradle index a219b38..d9a3419 100644 --- a/app/llx/app/build.gradle +++ b/app/llx/app/build.gradle @@ -126,8 +126,14 @@ android { } } } + buildFeatures { + aidl true + } + namespace 'net.pierrox.lightning_launcher_extreme' } dependencies { - compile project(':core') + implementation project(':core') + implementation project(':plugin-api') + implementation 'net.pierrox.android:lsvg:1.0' } diff --git a/app/llx/app/src/main/AndroidManifest.xml b/app/llx/app/src/main/AndroidManifest.xml index 555fb60..69152a2 100644 --- a/app/llx/app/src/main/AndroidManifest.xml +++ b/app/llx/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + android:sharedUserId="net.pierrox.lightning_launcher" > diff --git a/app/llx/app/src/main/java/net/pierrox/lightning_launcher/activities/AppDrawerX.java b/app/llx/app/src/main/java/net/pierrox/lightning_launcher/activities/AppDrawerX.java index 164973d..6d6d452 100644 --- a/app/llx/app/src/main/java/net/pierrox/lightning_launcher/activities/AppDrawerX.java +++ b/app/llx/app/src/main/java/net/pierrox/lightning_launcher/activities/AppDrawerX.java @@ -321,7 +321,7 @@ public class AppDrawerX extends Dashboard implements EditTextIme.OnEditTextImeLi saveState(); } - @SuppressWarnings("deprecation") + @SuppressWarnings("Deprecation") @Override protected Dialog onCreateDialog(int id) { AlertDialog.Builder builder; diff --git a/app/llx/build.gradle b/app/llx/build.gradle index dd3dd81..fae0d09 100644 --- a/app/llx/build.gradle +++ b/app/llx/build.gradle @@ -10,7 +10,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:8.1.1' } } diff --git a/app/llx/core/build.gradle b/app/llx/core/build.gradle index f7818c4..dae2a8c 100644 --- a/app/llx/core/build.gradle +++ b/app/llx/core/build.gradle @@ -6,8 +6,6 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 28 - versionCode 1 - versionName "1.0" buildConfigField "boolean", "IS_BETA", "false" ndk { @@ -31,11 +29,12 @@ android { path 'src/main/jni/CMakeLists.txt' } } + namespace 'net.pierrox.lightning_launcher' } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile files('libs/dx.jar') - compile 'net.pierrox.android:lsvg:1.0' - compile project(':plugin-api') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation files('libs/dx.jar') + implementation 'net.pierrox.android:lsvg:1.0' + implementation project(':plugin-api') } diff --git a/app/llx/core/src/main/AndroidManifest.xml b/app/llx/core/src/main/AndroidManifest.xml index af245c9..cb2a295 100644 --- a/app/llx/core/src/main/AndroidManifest.xml +++ b/app/llx/core/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/app/llx/gradle.properties b/app/llx/gradle.properties index d7d7162..ca242aa 100644 --- a/app/llx/gradle.properties +++ b/app/llx/gradle.properties @@ -17,6 +17,9 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false org.gradle.daemon=true #org.gradle.parallel=true #android.useDeprecatedNdk=true diff --git a/app/llx/gradle/wrapper/gradle-wrapper.properties b/app/llx/gradle/wrapper/gradle-wrapper.properties index 406443e..d8c9f59 100644 --- a/app/llx/gradle/wrapper/gradle-wrapper.properties +++ b/app/llx/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Dec 12 04:46:31 CET 2017 +#Sat Sep 16 18:41:27 KRAT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/app/llx/plugin-api/build.gradle b/app/llx/plugin-api/build.gradle index cecde1c..ce7de82 100644 --- a/app/llx/plugin-api/build.gradle +++ b/app/llx/plugin-api/build.gradle @@ -7,9 +7,8 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 26 - versionCode 1 - versionName "1.0" } + namespace 'net.pierrox.lightning_launcher.plugin' } diff --git a/app/llx/plugin-api/src/main/AndroidManifest.xml b/app/llx/plugin-api/src/main/AndroidManifest.xml index e322cd5..cc947c5 100644 --- a/app/llx/plugin-api/src/main/AndroidManifest.xml +++ b/app/llx/plugin-api/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/app/llx/wear/build.gradle b/app/llx/wear/build.gradle index 72da7d7..c91d6d8 100644 --- a/app/llx/wear/build.gradle +++ b/app/llx/wear/build.gradle @@ -47,9 +47,9 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.google.android.support:wearable:1.2.0' - provided 'com.google.android.wearable:wearable:1.0.0' - compile 'com.google.android.gms:play-services-wearable:6.5.87' - compile project(':core') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.google.android.support:wearable:1.2.0' + implementation 'com.google.android.wearable:wearable:1.0.0' + implementation 'com.google.android.gms:play-services-wearable:6.5.87' + implementation project(':core') }