diff --git a/analytics/build.gradle.kts b/analytics/build.gradle.kts index 2c93e51fd3c..b09df1e4e77 100644 --- a/analytics/build.gradle.kts +++ b/analytics/build.gradle.kts @@ -21,7 +21,8 @@ dependencies { implementation(project(":domain")) // Analytics - implementation(lib.mega.analytics) +// implementation(lib.mega.analytics) + implementation(project(":dependency")) // DI implementation(lib.javax.inject) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c5836f56d42..ddbe2767e88 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -206,7 +206,9 @@ dependencies { implementation(project(":feature:devicecenter")) implementation(project(":shared:resources")) implementation(project(":feature:chat")) - preBuiltSdkDependency(rootProject.extra) +// preBuiltSdkDependency(rootProject.extra) + implementation(files("../dependency/sdk-20250425.090537-rel.aar")) + //Test Modules testImplementation(project(":core-test")) @@ -260,7 +262,8 @@ dependencies { implementation(lib.coil.compose) implementation(androidx.paging.compose) implementation(lib.kotlinx.collections.immutable) - implementation(lib.mega.core.ui) +// implementation(lib.mega.core.ui) + implementation(project(":dependency")) implementation(androidx.material3) implementation(androidx.material3.adaptive) implementation(androidx.material3.adaptive.layout) @@ -326,19 +329,27 @@ dependencies { implementation(lib.simplestorage) implementation(lib.compose.state.events) implementation(testlib.hamcrest) - implementation(lib.mega.analytics) +// implementation(lib.mega.analytics) + implementation(project(":dependency")) implementation(lib.kotlin.serialisation) - implementation(lib.zoomable.telephoto) - implementation(lib.zoomable.image.coil) - implementation(lib.zoomable.image.core) - implementation(lib.zoomable.image.subsampling.image) - implementation(lib.telephoto.flick) + implementation(project(":dependency")) +// implementation(lib.zoomable.telephoto) +// implementation(lib.zoomable.image.coil) +// implementation(lib.zoomable.image.core) +// implementation(lib.zoomable.image.subsampling.image) +// implementation(lib.telephoto.flick) + implementation("me.saket.telephoto:zoomable-image-coil:0.15.1") + implementation("me.saket.telephoto:zoomable:0.15.1") +// implementation("me.saket.telephoto:zoomable-image-core:0.15.1") +// implementation("me.saket.telephoto:sub-sampling-image:0.15.1") + implementation("me.saket.telephoto:flick:0.15.1") + implementation(lib.commonmark.java) implementation(google.ump) // Debug - debugImplementation(lib.nocturn) - debugImplementation(lib.xray) +// debugImplementation(lib.nocturn) +// debugImplementation(lib.xray) if (!shouldUsePrebuiltSdk()) { implementation(files("../sdk/src/main/jni/megachat/webrtc/libwebrtc.jar")) diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index 3d93fb1ccc4..accf2b1a0b6 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -15,9 +15,9 @@ tools:node="merge" tools:replace="android:authorities"> - + + + { - override fun create(context: Context) { - if (!BuildConfig.ACTIVATE_NOCTURN) return - - val notificator = NocturnNotificator(context) - val nocturn = NocturnImpl(notificator) - nocturn.monitor(waitTimeout = BuildConfig.NOCTURN_TIMEOUT) - } - - override fun dependencies(): List>> = emptyList() -} +//package mega.privacy.android.app.initializer +// +//import android.content.Context +//import androidx.startup.Initializer +//import mega.privacy.android.app.BuildConfig +//import mega.privacy.android.nocturn.NocturnImpl +//import mega.privacy.android.nocturn.notification.NocturnNotificator +// +///** +// * Nocturn initializer +// */ +//class NocturnInitializer : Initializer { +// override fun create(context: Context) { +// if (!BuildConfig.ACTIVATE_NOCTURN) return +// +// val notificator = NocturnNotificator(context) +// val nocturn = NocturnImpl(notificator) +// nocturn.monitor(waitTimeout = BuildConfig.NOCTURN_TIMEOUT) +// } +// +// override fun dependencies(): List>> = emptyList() +//} diff --git a/app/src/debug/res/values/google_maps_api.xml b/app/src/debug/res/values/google_maps_api.xml new file mode 100644 index 00000000000..c3367a1fa0a --- /dev/null +++ b/app/src/debug/res/values/google_maps_api.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/release/res/values/google_maps_api.xml b/app/src/release/res/values/google_maps_api.xml new file mode 100644 index 00000000000..de585e79c8b --- /dev/null +++ b/app/src/release/res/values/google_maps_api.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/build.gradle.kts b/build.gradle.kts index 0bd4d9744d7..d4ea5a0c4bb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,10 +3,10 @@ import mega.privacy.android.build.isServerBuild plugins { alias(plugin.plugins.kotlin.compose) apply false alias(plugin.plugins.ksp) apply false - alias(plugin.plugins.mega.android.cicd) - alias(plugin.plugins.mega.android.release) +// alias(plugin.plugins.mega.android.cicd) +// alias(plugin.plugins.mega.android.release) alias(plugin.plugins.jfrog.artifactory) apply false - alias(plugin.plugins.mega.artifactory.publish.convention) apply false +// alias(plugin.plugins.mega.artifactory.publish.convention) apply false alias(plugin.plugins.de.mannodermaus.android.junit5) apply false alias(plugin.plugins.jetbrains.kotlin.android) apply false } @@ -45,31 +45,31 @@ allprojects { maven { url = uri("https://jitpack.io") } - maven { - url = - uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mega-sdk-android") - } - maven { - url = - uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mobile-analytics") - } - maven { - url = - uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/core-ui") - } - maven { - url = - uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/dev-tools") - } - maven { - url = - uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/karma") - } - - maven { - url = - uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mega-telephoto") - } +// maven { +// url = +// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mega-sdk-android") +// } +// maven { +// url = +// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mobile-analytics") +// } +// maven { +// url = +// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/core-ui") +// } +// maven { +// url = +// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/dev-tools") +// } +// maven { +// url = +// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/karma") +// } +// +// maven { +// url = +// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mega-telephoto") +// } } configurations.all { resolutionStrategy.cacheDynamicVersionsFor(5, "minutes") diff --git a/buildSrc/src/main/kotlin/mega/privacy/android/build/PrebuiltSdkDependency.kt b/buildSrc/src/main/kotlin/mega/privacy/android/build/PrebuiltSdkDependency.kt index bc5e0930946..fb8a24843cc 100644 --- a/buildSrc/src/main/kotlin/mega/privacy/android/build/PrebuiltSdkDependency.kt +++ b/buildSrc/src/main/kotlin/mega/privacy/android/build/PrebuiltSdkDependency.kt @@ -13,7 +13,9 @@ fun DependencyHandlerScope.preBuiltSdkDependency(extra: ExtraPropertiesExtension if (shouldUsePrebuiltSdk()) { println("use remote pre-built SDK") val megaSdkVersion = extra.get("megaSdkVersion") as String - "implementation"("nz.mega.sdk:sdk:$megaSdkVersion") +// "implementation"("nz.mega.sdk:sdk:$megaSdkVersion") +// "implementation"(project(":dependency")) +// "implementation"(files("../dependency/sdk-20250425.090537-rel.aar")) } else { println("use local SDK") "implementation"(project(":sdk")) diff --git a/core-test/build.gradle.kts b/core-test/build.gradle.kts index 82cb0150f77..fba4aaee2e9 100644 --- a/core-test/build.gradle.kts +++ b/core-test/build.gradle.kts @@ -19,5 +19,6 @@ dependencies { implementation(platform(testlib.junit5.bom)) implementation(testlib.junit.test.ktx) implementation(testlib.junit.jupiter.api) - implementation(lib.mega.analytics) +// implementation(lib.mega.analytics) + implementation(project(":dependency")) } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index a5a8b04df62..d5c4f3280cf 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -43,7 +43,8 @@ dependencies { //Test Modules testImplementation(project(":core-test")) - preBuiltSdkDependency(rootProject.extra) +// preBuiltSdkDependency(rootProject.extra) + implementation(files("../dependency/sdk-20250425.090537-rel.aar")) implementation(lib.coroutines.core) implementation(lib.kotlin.serialisation) diff --git a/dependency/analytics-annotations-android-20250506.075649.aar b/dependency/analytics-annotations-android-20250506.075649.aar new file mode 100644 index 00000000000..8d90e2e4bc4 Binary files /dev/null and b/dependency/analytics-annotations-android-20250506.075649.aar differ diff --git a/dependency/analytics-core-android-20250506.075649.aar b/dependency/analytics-core-android-20250506.075649.aar new file mode 100644 index 00000000000..c2edbcd928c Binary files /dev/null and b/dependency/analytics-core-android-20250506.075649.aar differ diff --git a/dependency/analytics-events-android-20250506.075649.aar b/dependency/analytics-events-android-20250506.075649.aar new file mode 100644 index 00000000000..5730ce11b3a Binary files /dev/null and b/dependency/analytics-events-android-20250506.075649.aar differ diff --git a/dependency/build.gradle.kts b/dependency/build.gradle.kts new file mode 100644 index 00000000000..d42d143da53 --- /dev/null +++ b/dependency/build.gradle.kts @@ -0,0 +1,7 @@ +configurations.maybeCreate("default") +artifacts.add("default", file("analytics-annotations-android-20250506.075649.aar")) +artifacts.add("default", file("analytics-core-android-20250506.075649.aar")) +artifacts.add("default", file("analytics-events-android-20250506.075649.aar")) +//artifacts.add("default", file("sdk-20250430.033435")) +artifacts.add("default", file("ui-2.128.20250415022409.aar")) +artifacts.add("default", file("ui-tokens-2.128.20250415022409.aar")) diff --git a/dependency/sdk-20250425.090537-rel.aar b/dependency/sdk-20250425.090537-rel.aar new file mode 100644 index 00000000000..25429f15eb5 Binary files /dev/null and b/dependency/sdk-20250425.090537-rel.aar differ diff --git a/dependency/ui-2.128.20250415022409.aar b/dependency/ui-2.128.20250415022409.aar new file mode 100644 index 00000000000..7d996869a5d Binary files /dev/null and b/dependency/ui-2.128.20250415022409.aar differ diff --git a/dependency/ui-tokens-2.128.20250415022409.aar b/dependency/ui-tokens-2.128.20250415022409.aar new file mode 100644 index 00000000000..849302db529 Binary files /dev/null and b/dependency/ui-tokens-2.128.20250415022409.aar differ diff --git a/feature/chat/build.gradle.kts b/feature/chat/build.gradle.kts index c126a0cc073..ad3c47e48e7 100644 --- a/feature/chat/build.gradle.kts +++ b/feature/chat/build.gradle.kts @@ -24,7 +24,8 @@ dependencies { implementation(project(":icon-pack")) implementation(project(":shared:resources")) implementation(project(":domain")) - implementation(lib.mega.core.ui) +// implementation(lib.mega.core.ui) + implementation(project(":dependency")) implementation(androidx.material3.window) implementation(androidx.bundles.compose.bom) implementation(androidx.material3) diff --git a/feature/devicecenter/build.gradle.kts b/feature/devicecenter/build.gradle.kts index d0c4c054e0a..6f1e922d244 100644 --- a/feature/devicecenter/build.gradle.kts +++ b/feature/devicecenter/build.gradle.kts @@ -20,7 +20,8 @@ android { } dependencies { - preBuiltSdkDependency(rootProject.extra) +// preBuiltSdkDependency(rootProject.extra) + implementation(files("../../dependency/sdk-20250425.090537-rel.aar")) implementation(project(":core:formatter")) lintChecks(project(":lint")) @@ -38,7 +39,8 @@ dependencies { testImplementation(project(":core-test")) testImplementation(project(":core-ui-test")) - implementation(lib.mega.analytics) +// implementation(lib.mega.analytics) + implementation(project(":dependency")) implementation(lib.kotlin.ktx) implementation(lib.logging.timber) implementation(androidx.appcompat) diff --git a/feature/sync/build.gradle.kts b/feature/sync/build.gradle.kts index e87a3ea0c82..dc52db23959 100644 --- a/feature/sync/build.gradle.kts +++ b/feature/sync/build.gradle.kts @@ -29,7 +29,8 @@ dependencies { testImplementation(project(":core-test")) testImplementation(project(":core-ui-test")) lintChecks(project(":lint")) - preBuiltSdkDependency(rootProject.extra) +// preBuiltSdkDependency(rootProject.extra) + implementation(files("../../dependency/sdk-20250425.090537-rel.aar")) implementation(project(":domain")) implementation(project(":data")) @@ -43,7 +44,8 @@ dependencies { implementation(lib.kotlin.ktx) implementation(lib.logging.timber) - implementation(lib.mega.analytics) +// implementation(lib.mega.analytics) + implementation(project(":dependency")) implementation(google.gson) implementation(androidx.datastore.preferences) diff --git a/gradle/catalogs/lib.versions.toml b/gradle/catalogs/lib.versions.toml index bc92959a138..c0f5d201544 100644 --- a/gradle/catalogs/lib.versions.toml +++ b/gradle/catalogs/lib.versions.toml @@ -19,7 +19,7 @@ karma = "1.3" kotlin-serialisation = "1.8.1" eclipse-jgit = "6.6.0.202305301015-r" json = "20240303" -mega-telephoto = "0.15.2" +mega-telephoto = "0.15.1" telephoto = "0.14.0" mega-core-ui = "2.128.20250415022409" kotlinx-collections-immutable = "0.3.7" @@ -66,10 +66,10 @@ kotlin-serialisation = { module = "org.jetbrains.kotlinx:kotlinx-serialization-j eclipse-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit"} eclipse-jgit-ssh-jsch = { module = "org.eclipse.jgit:org.eclipse.jgit.ssh.jsch", version.ref = "eclipse-jgit"} json = { module = "org.json:json", version.ref = "json"} -zoomable-telephoto = { module = "me.saket.telephoto.mega:zoomable", version.ref = "mega-telephoto" } -zoomable-image-coil = { module = "me.saket.telephoto.mega:zoomable-image-coil", version.ref = "mega-telephoto" } -zoomable-image-core = { module = "me.saket.telephoto.mega:zoomable-image-core", version.ref = "mega-telephoto" } -zoomable-image-subsampling-image = { module = "me.saket.telephoto.mega:sub-sampling-image", version.ref = "mega-telephoto" } +zoomable-telephoto = { module = "me.saket.telephoto:zoomable", version.ref = "mega-telephoto" } +zoomable-image-coil = { module = "me.saket.telephoto:zoomable-image-coil", version.ref = "mega-telephoto" } +zoomable-image-core = { module = "me.saket.telephoto:zoomable-image-core", version.ref = "mega-telephoto" } +zoomable-image-subsampling-image = { module = "me.saket.telephoto:sub-sampling-image", version.ref = "mega-telephoto" } telephoto-flick = { module = "me.saket.telephoto:flick", version.ref = "telephoto" } mega-core-ui = { group = "mega.android.core", name = "ui", version.ref = "mega-core-ui" } mega-core-ui-tokens = { group = "mega.android.core", name = "ui-tokens", version.ref = "mega-core-ui"} diff --git a/navigation/build.gradle.kts b/navigation/build.gradle.kts index 16e896b91d3..491a1e35963 100644 --- a/navigation/build.gradle.kts +++ b/navigation/build.gradle.kts @@ -12,7 +12,8 @@ dependencies { implementation(project(":domain")) implementation(androidx.appcompat) implementation(androidx.navigation.compose) - implementation(lib.mega.analytics) +// implementation(lib.mega.analytics) + implementation(project(":dependency")) testImplementation(testlib.bundles.ui.test) testImplementation(testlib.bundles.unit.test) diff --git a/sdk/src/main/jni/megachat/sdk b/sdk/src/main/jni/megachat/sdk index 1826832e53b..8989f578cc5 160000 --- a/sdk/src/main/jni/megachat/sdk +++ b/sdk/src/main/jni/megachat/sdk @@ -1 +1 @@ -Subproject commit 1826832e53b98cb1cf235d36347415d44dd7df3d +Subproject commit 8989f578cc5b26a933607cd7ffe6e96d411a361c diff --git a/settings.gradle.kts b/settings.gradle.kts index de33cea5631..49e2bb9dbf2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,23 +4,23 @@ pluginManagement { google() mavenCentral() gradlePluginPortal() - maven { - url = - uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/megagradle") - } - } - resolutionStrategy { - eachPlugin { - when (requested.id.id) { - "mega.android.release", - "mega.android.cicd", - "mega.artifactory.publish.convention", - -> useModule("mega.privacy:megagradle:${requested.version}") - - else -> {} - } - } +// maven { +// url = +// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/megagradle") +// } } +// resolutionStrategy { +// eachPlugin { +// when (requested.id.id) { +// "mega.android.release", +// "mega.android.cicd", +// "mega.artifactory.publish.convention", +// -> useModule("mega.privacy:megagradle:${requested.version}") +// +// else -> {} +// } +// } +// } } dependencyResolutionManagement { @@ -58,6 +58,7 @@ include(":shared:resources") include(":shared:sync") include(":android-database-sqlcipher") include(":feature:chat") +include(":dependency") println("isServerBuild = ${isServerBuild()}") diff --git a/shared/original-core-ui/build.gradle.kts b/shared/original-core-ui/build.gradle.kts index 7f93410809e..799a920d8aa 100644 --- a/shared/original-core-ui/build.gradle.kts +++ b/shared/original-core-ui/build.gradle.kts @@ -48,8 +48,9 @@ dependencies { implementation(lib.coil.compose) implementation(lib.balloon) implementation(google.accompanist.placeholder) - api(lib.mega.core.ui) - implementation(lib.mega.core.ui.tokens) +// api(lib.mega.core.ui) +// implementation(lib.mega.core.ui.tokens) + api(project(":dependency")) implementation(lib.kotlinx.collections.immutable) debugImplementation(google.gson)