From d40895146826bf34b46f7c05171c4a322c832c93 Mon Sep 17 00:00:00 2001 From: Benoit Letondor Date: Fri, 3 May 2024 00:38:19 +0200 Subject: [PATCH 1/2] Bump deps --- Android/EasyBudget/app/build.gradle.kts | 22 +++++++++---------- .../easybudgetapp/EasyBudget.kt | 3 +-- .../db/onlineimpl/OnlineDBImpl.kt | 4 ++-- .../easybudgetapp/view/main/MainActivity.kt | 4 +--- Android/EasyBudget/build.gradle.kts | 8 +++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Android/EasyBudget/app/build.gradle.kts b/Android/EasyBudget/app/build.gradle.kts index b434b2a8..87ffdb12 100644 --- a/Android/EasyBudget/app/build.gradle.kts +++ b/Android/EasyBudget/app/build.gradle.kts @@ -93,7 +93,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.5.11" + kotlinCompilerExtensionVersion = "1.5.13" } buildFeatures { @@ -113,13 +113,13 @@ dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.core:core-ktx:1.12.0") - implementation("com.google.android.material:material:1.11.0") + implementation("androidx.core:core-ktx:1.13.1") + implementation("com.google.android.material:material:1.12.0") implementation("androidx.recyclerview:recyclerview:1.3.2") implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation("androidx.preference:preference-ktx:1.2.1") - implementation("androidx.activity:activity-ktx:1.8.2") - implementation("androidx.fragment:fragment-ktx:1.6.2") + implementation("androidx.activity:activity-ktx:1.9.0") + implementation("androidx.fragment:fragment-ktx:1.7.0") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") @@ -130,7 +130,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0") - implementation(platform("com.google.firebase:firebase-bom:32.8.1")) + implementation(platform("com.google.firebase:firebase-bom:33.0.0")) implementation("com.google.firebase:firebase-messaging-ktx") implementation("com.google.firebase:firebase-storage") implementation("com.google.firebase:firebase-crashlytics") @@ -138,21 +138,21 @@ dependencies { implementation("com.google.firebase:firebase-firestore-ktx") implementation("com.firebaseui:firebase-ui-auth:8.0.2") - val composeBom = platform("androidx.compose:compose-bom:2024.04.00") + val composeBom = platform("androidx.compose:compose-bom:2024.05.00") implementation(composeBom) androidTestImplementation(composeBom) debugImplementation("androidx.compose.ui:ui-tooling") implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.material3:material3") implementation("androidx.compose.ui:ui") - implementation("androidx.activity:activity-compose:1.8.2") + implementation("androidx.activity:activity-compose:1.9.0") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0") implementation("com.google.accompanist:accompanist-themeadapter-material3:0.34.0") - implementation("com.android.billingclient:billing-ktx:6.2.0") + implementation("com.android.billingclient:billing-ktx:6.2.1") implementation("me.relex:circleindicator:2.1.6@aar") - implementation("com.batch.android:batch-sdk:1.21.1") + implementation("com.batch.android:batch-sdk:2.0.0") implementation("com.google.dagger:hilt-android:$hiltVersion") implementation("androidx.hilt:hilt-work:1.2.0") @@ -165,7 +165,7 @@ dependencies { implementation("io.realm.kotlin:library-sync:$realmVersion") - implementation("com.kizitonwose.calendar:compose:2.5.0") + implementation("com.kizitonwose.calendar:compose:2.5.1") implementation("net.sf.biweekly:biweekly:0.6.8") implementation("net.lingala.zip4j:zip4j:2.11.5") diff --git a/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/EasyBudget.kt b/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/EasyBudget.kt index 51458b48..0fad77d4 100644 --- a/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/EasyBudget.kt +++ b/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/EasyBudget.kt @@ -32,7 +32,6 @@ import androidx.work.Configuration import com.batch.android.Batch import com.batch.android.BatchActivityLifecycleHelper import com.batch.android.BatchNotificationChannelsManager.DEFAULT_CHANNEL_ID -import com.batch.android.Config import com.batch.android.PushNotificationType import com.benoitletondor.easybudgetapp.db.DB import com.benoitletondor.easybudgetapp.helper.* @@ -347,7 +346,7 @@ class EasyBudget : Application(), Configuration.Provider { } } - Batch.setConfig(Config(BuildConfig.BATCH_API_KEY)) + Batch.start(BuildConfig.BATCH_API_KEY) Batch.Push.setManualDisplay(true) Batch.Push.setSmallIconResourceId(R.drawable.ic_push) Batch.Push.setNotificationsColor(ContextCompat.getColor(this, R.color.accent)) diff --git a/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/db/onlineimpl/OnlineDBImpl.kt b/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/db/onlineimpl/OnlineDBImpl.kt index e8544738..6fd6633b 100644 --- a/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/db/onlineimpl/OnlineDBImpl.kt +++ b/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/db/onlineimpl/OnlineDBImpl.kt @@ -322,7 +322,7 @@ class OnlineDBImpl( override suspend fun updateRecurringExpenseAfterDate( newRecurringExpense: RecurringExpense, - afterDate: LocalDate, + oldOccurrenceDate: LocalDate, ) { val recurringExpenses = awaitRecurringExpensesLoadOrThrow().expenses @@ -331,7 +331,7 @@ class OnlineDBImpl( realm.write { findLatest(entity)?.updateAllOccurrencesAfterDate( - afterDate, + afterDate = oldOccurrenceDate, newRecurringExpense, ) } diff --git a/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/view/main/MainActivity.kt b/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/view/main/MainActivity.kt index f8f12803..dd1e6287 100644 --- a/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/view/main/MainActivity.kt +++ b/Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/view/main/MainActivity.kt @@ -16,7 +16,6 @@ package com.benoitletondor.easybudgetapp.view.main -import android.annotation.SuppressLint import android.content.Intent import android.os.Bundle import android.view.Menu @@ -252,8 +251,7 @@ class MainActivity : BaseActivity(), MenuProvider { } } - @SuppressLint("MissingSuperCall") // Not sure why this is reported, probably a bug - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) this.intent = intent diff --git a/Android/EasyBudget/build.gradle.kts b/Android/EasyBudget/build.gradle.kts index e9e0bbe6..ee140ab7 100644 --- a/Android/EasyBudget/build.gradle.kts +++ b/Android/EasyBudget/build.gradle.kts @@ -15,15 +15,15 @@ */ val kotlinVersion by extra("1.9.23") // Change in the plugins below too val hiltVersion by extra("2.51.1") // Change in the plugins below too -val realmVersion by extra("1.14.1") // Change in the plugins below too +val realmVersion by extra("1.16.0") // Change in the plugins below too plugins { - id("com.android.application") version "8.3.2" apply false - id("com.android.library") version "8.3.2" apply false + id("com.android.application") version "8.4.0" apply false + id("com.android.library") version "8.4.0" apply false id("com.google.firebase.crashlytics") version "2.9.9" apply false id("com.google.gms.google-services") version "4.4.1" apply false id("org.jetbrains.kotlin.android") version "1.9.23" apply false id("com.google.dagger.hilt.android") version "2.51.1" apply false id("com.google.devtools.ksp") version "1.9.23-1.0.20" apply false - id("io.realm.kotlin") version "1.14.1" apply false + id("io.realm.kotlin") version "1.16.0" apply false } diff --git a/Android/EasyBudget/gradle/wrapper/gradle-wrapper.properties b/Android/EasyBudget/gradle/wrapper/gradle-wrapper.properties index 2ea3535d..e7646dea 100644 --- a/Android/EasyBudget/gradle/wrapper/gradle-wrapper.properties +++ b/Android/EasyBudget/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 779f084169310c4f561f3830c5eda685aa166013 Mon Sep 17 00:00:00 2001 From: Benoit Letondor Date: Fri, 3 May 2024 00:38:47 +0200 Subject: [PATCH 2/2] Bump version --- Android/EasyBudget/app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android/EasyBudget/app/build.gradle.kts b/Android/EasyBudget/app/build.gradle.kts index 87ffdb12..7ed8b464 100644 --- a/Android/EasyBudget/app/build.gradle.kts +++ b/Android/EasyBudget/app/build.gradle.kts @@ -38,8 +38,8 @@ android { compileSdk = 34 minSdk = 23 targetSdk = 34 - versionCode = 134 - versionName = "3.2.1" + versionCode = 135 + versionName = "3.2.2" vectorDrawables.useSupportLibrary = true }