Skip to content

Commit 298f9b5

Browse files
committed
Migrate to version catalog and target Android 14
1 parent 575475f commit 298f9b5

12 files changed

+86
-30
lines changed

.idea/appInsightsSettings.xml

+28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetDropDown.xml

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/migrations.xml

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You need at least Grocy Android v2.0.0 for the unlocking feature to work.
3939

4040
## License
4141

42-
Copyright © 2020-2022 Patrick Zedler & Dominic Zedler. All rights reserved.
42+
Copyright © 2020-2023 Patrick Zedler & Dominic Zedler. All rights reserved.
4343

4444
[GNU General Public License version 3](https://www.gnu.org/licenses/gpl.txt)
4545

app/build.gradle

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,21 @@
1818
*/
1919

2020
plugins {
21-
id 'com.android.application'
21+
alias libs.plugins.android.application
2222
}
2323

2424
android {
2525
namespace 'xyz.zedler.patrick.grocy.unlock'
26-
compileSdkVersion 33
27-
buildToolsVersion '33.0.1'
26+
compileSdk 34
27+
buildToolsVersion '34.0.0'
2828

2929
defaultConfig {
3030
applicationId "xyz.zedler.patrick.grocy.unlock"
31-
minSdkVersion 21
32-
targetSdkVersion 33
33-
versionCode 4
34-
versionName '1.0.3'
31+
minSdk 21
32+
targetSdk 34
33+
versionCode 5
34+
versionName '1.0.4'
35+
resConfigs 'en'
3536
}
3637

3738
buildTypes {
@@ -57,10 +58,9 @@ android {
5758
}
5859

5960
compileOptions {
60-
sourceCompatibility 11
61-
targetCompatibility 11
61+
sourceCompatibility JavaVersion.VERSION_11
62+
targetCompatibility JavaVersion.VERSION_11
6263
}
6364
}
6465

65-
dependencies {
66-
}
66+
dependencies {}

build.gradle

+2-12
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@
1818
*/
1919

2020
// Top-level build file where you can add configuration options common to all sub-projects/modules.
21-
buildscript {
22-
repositories {
23-
google()
24-
mavenCentral()
25-
}
26-
dependencies {
27-
classpath 'com.android.tools.build:gradle:7.4.0'
28-
}
29-
}
30-
31-
task clean(type: Delete) {
32-
delete rootProject.buildDir
21+
plugins {
22+
alias(libs.plugins.android.application) apply false
3323
}

gradle.properties

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
3535
# https://developer.android.com/topic/libraries/support-library/androidx-rn
3636
android.useAndroidX=true
3737
# Automatically convert third-party libraries to use AndroidX
38-
android.enableJetifier=true
38+
android.enableJetifier=true
39+
android.defaults.buildfeatures.buildconfig=true
40+
android.nonTransitiveRClass=false
41+
android.nonFinalResIds=false

gradle/libs.versions.toml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[versions]
2+
agp = "8.1.1"
3+
4+
[libraries]
5+
6+
[plugins]
7+
android-application = { id = "com.android.application", version.ref = "agp" }
8+

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
#Thu Dec 29 01:09:46 CET 2022
2121
distributionBase=GRADLE_USER_HOME
2222
distributionPath=wrapper/dists
23-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
23+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip
2424
zipStoreBase=GRADLE_USER_HOME
2525
zipStorePath=wrapper/dists

settings.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,20 @@
1717
* Copyright (c) 2020-2022 by Patrick Zedler and Dominic Zedler
1818
*/
1919

20+
pluginManagement {
21+
repositories {
22+
google()
23+
mavenCentral()
24+
gradlePluginPortal()
25+
}
26+
}
2027
dependencyResolutionManagement {
2128
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
2229
repositories {
2330
google()
2431
mavenCentral()
2532
}
2633
}
34+
2735
rootProject.name = "Grocy Unlock Key"
2836
include ':app'

0 commit comments

Comments
 (0)