commit c395c3374ce4d10c23a3ba0d2eb63ae98db3c84e
parent 2718831a3ba46b3c8a517bdf9fdae42b713eddf3
Author: rhunk <101876869+rhunk@users.noreply.github.com>
Date: Thu, 18 May 2023 19:18:36 +0200
build: upgrade to gradle 8.0
Diffstat:
6 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,12 +7,13 @@ def appVersionName = "0.0.1"
def appVersionCode = 1
android {
- compileSdk 32
+ compileSdk 33
+ buildToolsVersion = "33.0.2"
defaultConfig {
applicationId "me.rhunk.snapenhance"
minSdk 29
- targetSdk 32
+ targetSdk 33
versionCode appVersionCode
versionName appVersionName
multiDexEnabled true
@@ -41,6 +42,7 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}
+ namespace 'me.rhunk.snapenhance'
}
afterEvaluate {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="me.rhunk.snapenhance">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/menus/MenuViewInjector.kt b/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/menus/MenuViewInjector.kt
@@ -119,8 +119,8 @@ class MenuViewInjector : Feature("MenuViewInjector", loadParams = FeatureLoadPar
settingMenu.inject(viewGroup, originalAddView)
viewGroup.addOnAttachStateChangeListener(object: View.OnAttachStateChangeListener {
- override fun onViewAttachedToWindow(v: View?) {}
- override fun onViewDetachedFromWindow(v: View?) {
+ override fun onViewAttachedToWindow(v: View) {}
+ override fun onViewDetachedFromWindow(v: View) {
context.config.writeConfig()
}
})
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id 'com.android.application' version '7.2.2' apply false
- id 'com.android.library' version '7.2.2' apply false
+ id 'com.android.application' version '8.0.1' apply false
+ id 'com.android.library' version '8.0.1' apply false
id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
}
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
delete rootProject.buildDir
}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true-
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false+
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri May 12 21:23:16 CEST 2023
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
