Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
- Upgrade backup api to v1.4.0
- Change target sdk to 34
- Upgrade gradle and kotlin version
- Update other dependencies
  • Loading branch information
udenr committed Dec 9, 2024
1 parent 3eeaa62 commit 7fd7ad1
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 29 deletions.
32 changes: 16 additions & 16 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'

android {
compileSdkVersion 33

defaultConfig {
applicationId "privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist"
minSdkVersion 19
targetSdkVersion 33
compileSdk 34
targetSdkVersion 34
versionCode 8
versionName "1.1"
multiDexEnabled true
Expand All @@ -23,8 +23,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

testOptions {
Expand Down Expand Up @@ -58,10 +58,11 @@ android {
lint {
lintConfig = file("lint.xml")
}
namespace 'privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist'
}

android.applicationVariants.all { variant ->
variant.outputs.all {
android.applicationVariants.configureEach { variant ->
variant.outputs.configureEach {
def appName = "pfa-shopping-list"
outputFileName = appName + "-${variant.name}-v${variant.versionName}.apk"
}
Expand All @@ -70,17 +71,16 @@ android.applicationVariants.all { variant ->
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
// android
androidTestImplementation 'androidx.annotation:annotation:1.0.0'

implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.cardview:cardview:1.0.0'

// tests
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:2.7.6'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test:rules:1.6.1'
Expand All @@ -104,17 +104,17 @@ dependencies {
// image zoom
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0'

implementation 'androidx.sqlite:sqlite:2.3.0'
implementation 'androidx.sqlite:sqlite-ktx:2.3.0'
implementation 'androidx.sqlite:sqlite:2.4.0'
implementation 'androidx.sqlite:sqlite-ktx:2.4.0'

// Backup API
implementation project(':backup-api')
def work_version = '2.7.1'
def work_version = '2.9.0'
implementation "androidx.work:work-runtime:$work_version"
implementation "androidx.work:work-runtime-ktx:$work_version"
androidTestImplementation "androidx.work:work-testing:$work_version"

implementation 'androidx.core:core-ktx:1.7.20'
implementation "androidx.core:core-ktx:$kotlin_version"

// Multi-Dex
def multidex_version = "2.0.1"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.CAMERA"/>
<uses-feature android:name="android.hardware.camera" android:required="false"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class PFAShoppingListApplication : Application(), Configuration.Provider {
}
}

override fun getWorkManagerConfiguration(): Configuration {
return Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build()
}
override val workManagerConfiguration: Configuration
get() = Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build()
}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ buildscript {
google()
}

ext.kotlin_version = "1.7.20"
ext.kotlin_version = "1.9.10"
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.1.4'
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

Expand All @@ -25,6 +25,6 @@ allprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
6 changes: 5 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,9 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.useAndroidX=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 13 12:17:28 CET 2023
#Mon Dec 09 15:57:39 CET 2024
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 7fd7ad1

Please sign in to comment.