Skip to content

Commit

Permalink
chore: Update dependencies and remove READ_CONTACTS permission
Browse files Browse the repository at this point in the history
This commit updates various dependencies to their latest versions, including Compose, Koin, Ktor, and Firebase. It also removes the `READ_CONTACTS` permission from the Android manifest, as it is no longer needed.

Additionally, proguard configurations are updated to support the updated Ktor library and Ktorfit library.
  • Loading branch information
niyajali committed Dec 24, 2024
1 parent b5c0b36 commit e4dea58
Show file tree
Hide file tree
Showing 11 changed files with 1,084 additions and 1,103 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/multi-platform-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,6 @@ on:
default: false
description: Publish iOS App On App Store

publish_desktop:
type: boolean
default: false
description: Publish Desktop Apps On App Store

publish_web:
type: boolean
default: true
description: Publish Web App

build_ios:
type: boolean
default: false
description: Build iOS App

permissions:
contents: write
id-token: write
Expand All @@ -122,10 +107,7 @@ jobs:
desktop_package_name: 'mifospay-desktop' # <-- Change this to your desktop package name
web_package_name: 'mifospay-web' # <-- Change this to your web package name
publish_android: ${{ inputs.publish_android }}
build_ios: ${{ inputs.build_ios }}
publish_ios: ${{ inputs.publish_ios }}
publish_desktop: ${{ inputs.publish_desktop }}
publish_web: ${{ inputs.publish_web }}
secrets:
original_keystore_file: ${{ secrets.ORIGINAL_KEYSTORE_FILE }}
original_keystore_file_password: ${{ secrets.ORIGINAL_KEYSTORE_FILE_PASSWORD }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import com.google.devtools.ksp.gradle.KspExtension

import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies
import org.mifospay.libs

Expand All @@ -23,10 +22,6 @@ class KMPKoinConventionPlugin : Plugin<Project> {

add("commonTestImplementation", libs.findLibrary("koin.test").get())
}

extensions.configure<KspExtension> {
arg("KOIN_CONFIG_CHECK","true")
}
}
}
}
10 changes: 9 additions & 1 deletion core/network/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
-keep class io.ktor.** { *; }
-keep class kotlinx.serialization.** { *; }
-keep class io.ktor.client.network.sockets.** { *; }
-keep class io.ktor.client.plugins.* { *; }
-keep class io.ktor.util.* { *; }
-keep class io.ktor.utils.io.* { *; }
-keep class java.lang.management.* { *; }
-dontwarn io.ktor.client.network.sockets.SocketTimeoutException
-dontwarn java.lang.management.RuntimeMXBean

Expand All @@ -19,4 +24,7 @@
-dontwarn org.bouncycastle.**
-dontwarn org.openjsse.**

-keep class org.mifospay.core.network.services.* { *;}
-keep class org.mifospay.core.network.services.* { *;}
-keep class de.jensklingenberg.ktorfit.converter.** { *; }
-keep class de.jensklingenberg.ktorfit.** { *; }
-keeppackagenames de.jensklingenberg.ktorfit.*
26 changes: 13 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ androidTools = "31.7.2"
androidx-test-ext-junit = "1.2.1"
androidxActivity = "1.9.3"
androidxBrowser = "1.8.0"
androidxComposeBom = "2024.11.00"
androidxComposeBom = "2024.12.01"
androidxComposeCompiler = "1.5.15"
androidxComposeMaterial3Adaptive = "1.0.0"
androidxComposeRuntimeTracing = "1.7.5"
androidxComposeRuntimeTracing = "1.7.6"
androidxCoreSplashscreen = "1.0.1"
androidxLifecycle = "2.8.7"
androidxMetrics = "1.0.0-beta01"
androidxNavigation = "2.8.4"
androidxNavigation = "2.8.5"
androidxProfileinstaller = "1.4.1"
androidxTracing = "1.3.0-alpha02"
appcompatVersion = "1.7.0"
Expand All @@ -28,9 +28,9 @@ lifecycleExtensionsVersion = "2.2.0"
lifecycleVersion = "2.8.7"

# Android Camera & Play Services
cameraLifecycleVersion = "1.4.0"
cameraViewVersion = "1.4.0"
playServicesAuthVersion = "21.2.0"
cameraLifecycleVersion = "1.4.1"
cameraViewVersion = "1.4.1"
playServicesAuthVersion = "21.3.0"
playServicesCodeScanner = "16.1.0"
mlkit="17.3.0"

Expand Down Expand Up @@ -65,26 +65,26 @@ versionCatalogLinterVersion = "1.0.3"
fineractSdk = "1.0.3"

# Firebase
firebaseBom = "33.6.0"
firebaseBom = "33.7.0"
firebaseCrashlyticsPlugin = "3.0.2"
firebasePerfPlugin = "1.4.2"

# Kotlin KMP Dependencies
kotlin = "2.0.21"
kotlin = "2.1.0"
kotlinInject = "0.7.2"
kotlinxCoroutines = "1.9.0"
kotlinxDatetime = "0.6.1"
kotlinxImmutable = "0.3.8"
kotlinxSerializationJson = "1.7.3"
ksp = "2.0.21-1.0.27"
ksp = "2.1.0-1.0.29"

# Ktor & Ktorfit
ktorVersion = "3.0.1"
ktorVersion = "3.0.3"
ktorfit = "2.2.0"
ktorfitKsp = "2.2.0-1.0.27"
ktorfitKsp = "2.2.0-1.0.29"

# Koin CMP Dependencies
koin = "4.0.0"
koin = "4.0.1-RC1"
koinAnnotationsVersion = "1.4.0-RC4"

# CMP Libraries
Expand All @@ -104,7 +104,7 @@ wire = "5.0.0"
windowsSizeClass = "0.5.0"
uiDesktopVersion = "1.7.0"
composeJB = "1.7.0"
composeLifecycle = "2.8.2"
composeLifecycle = "2.8.3"
composeNavigation = "2.8.0-alpha10"
jbCoreBundle = "1.0.1"
jbSavedState = "1.2.2"
Expand Down
16 changes: 4 additions & 12 deletions mifospay-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,6 @@ import com.google.gms.googleservices.GoogleServicesPlugin.GoogleServicesPluginCo
import org.mifospay.MifosBuildType
import org.mifospay.dynamicVersion

/*
* Copyright 2024 Mifos Initiative
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md
*/

plugins {
alias(libs.plugins.mifospay.android.application)
alias(libs.plugins.mifospay.android.application.compose)
Expand Down Expand Up @@ -58,10 +48,12 @@ android {
applicationIdSuffix = MifosBuildType.DEBUG.applicationIdSuffix
}

// Disabling proguard for now until
// https://github.com/openMF/mobile-wallet/issues/1815 this issue is resolved
release {
isMinifyEnabled = true
isMinifyEnabled = false
applicationIdSuffix = MifosBuildType.RELEASE.applicationIdSuffix
isShrinkResources = true
isShrinkResources = false
isDebuggable = false
isJniDebuggable = false
signingConfig = signingConfigs.getByName("release")
Expand Down
Loading

0 comments on commit e4dea58

Please sign in to comment.