diff --git a/app/build.gradle b/app/build.gradle index 5a74ab16..6806a5f5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,12 +6,12 @@ plugins { android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.draco.ladb" minSdk 26 - targetSdk 33 + targetSdk 34 versionCode 43 versionName "2.3.1" @@ -49,6 +49,7 @@ android { buildFeatures { viewBinding true + android.buildFeatures.buildConfig true } namespace 'com.draco.ladb' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0cad275e..85b1ea7a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,6 @@ = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + // ---------------------------------REVIEW NEEDED----------------------------- + // pretty sure it should be getService call otherwise it should be getActivity + PendingIntent.getService( + applicationContext, + 0, + intent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_ONE_SHOT + ) + }else{ + // if sdk_int is less than UPSIDE_DOWN_CAKE + startActivityAndCollapse(intent) + } + } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index a76c5391..4e362a52 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.1' + classpath 'com.android.tools.build:gradle:8.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6' diff --git a/gradle.properties b/gradle.properties index 5fae978e..06316435 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,3 +19,5 @@ android.useAndroidX=true kotlin.code.style=official DEBUG_ANTIPIRACY=false RELEASE_ANTIPIRACY=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6264c143..9b002469 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jun 03 20:49:13 PDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME