Configure to latest core changes
This commit is contained in:
dkadrikj
Mateusz Armatys
parent
4fec58b1f0
commit
39b5224d28
|
|
@ -269,6 +269,9 @@ tasks.withType<Test> {
|
|||
dependencies {
|
||||
|
||||
androidTestImplementation(files("libs/fusion-release.aar"))
|
||||
coreLibraryDesugaring(
|
||||
`desugaring`
|
||||
)
|
||||
// Hilt
|
||||
kapt(
|
||||
`assistedInject-processor-dagger`,
|
||||
|
|
|
|||
|
|
@ -100,6 +100,11 @@
|
|||
android:value="androidx.startup"
|
||||
tools:node="remove" />
|
||||
|
||||
<meta-data
|
||||
android:name="me.proton.core.plan.presentation.UnredeemedPurchaseInitializer"
|
||||
android:value="androidx.startup"
|
||||
tools:node="remove" />
|
||||
|
||||
<!-- Disable default WorkManagerInitializer for use Hilt injection -->
|
||||
<meta-data
|
||||
android:name="androidx.work.WorkManagerInitializer"
|
||||
|
|
|
|||
|
|
@ -109,6 +109,7 @@ import me.proton.core.auth.presentation.MissingScopeInitializer;
|
|||
import me.proton.core.crypto.validator.presentation.init.CryptoValidatorInitializer;
|
||||
import me.proton.core.domain.entity.UserId;
|
||||
import me.proton.core.humanverification.presentation.HumanVerificationInitializer;
|
||||
import me.proton.core.plan.presentation.UnredeemedPurchaseInitializer;
|
||||
import me.proton.core.util.kotlin.CoreLogger;
|
||||
import studio.forface.viewstatestore.ViewStateStoreConfig;
|
||||
import timber.log.Timber;
|
||||
|
|
@ -230,6 +231,7 @@ public class ProtonMailApplication extends Application implements androidx.work.
|
|||
appInitializer.initializeComponent(SecurityManagerInitializer.class);
|
||||
appInitializer.initializeComponent(HumanVerificationInitializer.class);
|
||||
appInitializer.initializeComponent(MissingScopeInitializer.class);
|
||||
appInitializer.initializeComponent(UnredeemedPurchaseInitializer.class);
|
||||
|
||||
checkForUpdateAndClearCache();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ repositories {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
val android = "7.0.4"
|
||||
val android = "7.2.2"
|
||||
val easyGradle = "2.8"
|
||||
|
||||
// Needed for setup Android config
|
||||
|
|
@ -44,9 +44,9 @@ dependencies {
|
|||
}
|
||||
val compileKotlin: KotlinCompile by tasks
|
||||
compileKotlin.kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
jvmTarget = "11"
|
||||
}
|
||||
val compileTestKotlin: KotlinCompile by tasks
|
||||
compileTestKotlin.kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
jvmTarget = "11"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,7 +78,8 @@ fun org.gradle.api.Project.android(
|
|||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
isCoreLibraryDesugaringEnabled = true
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = sourceCompatibility
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ val DependencyHandler.`rxRelay` get() = jakeWharton("rxrelay
|
|||
val DependencyHandler.`apache-commons-lang` get() = dependency("org.apache", "commons", moduleSuffix = "lang3") version `apache-commons-lang version`
|
||||
val DependencyHandler.`butterknife-runtime` get() = jakeWharton(module = "butterknife") version `butterKnife version`
|
||||
val DependencyHandler.`butterknife-compiler` get() = jakeWharton(module = "butterknife", moduleSuffix = "compiler") version `butterKnife version`
|
||||
val DependencyHandler.`desugaring` get() = android( "tools", module = "desugar_jdk_libs") version `desugaring version`
|
||||
val DependencyHandler.`firebase-messaging` get() = google("firebase", moduleSuffix = "messaging") version `firebase-messaging version`
|
||||
val DependencyHandler.`gson` get() = google("code.gson", "gson") version `gson version`
|
||||
val DependencyHandler.`jsoup` get() = dependency("org.jsoup", module = "jsoup") version `jsoup version`
|
||||
|
|
|
|||
|
|
@ -53,10 +53,10 @@ fun initVersions() {
|
|||
`assistedInject version` = "0.6.0" // Released: Sep 14, 2020
|
||||
`dagger version` = "2.40.5" // Released: Dec 07, 2021
|
||||
|
||||
`mockK version` = "1.12.2" // Released: Dec 31, 2021
|
||||
`mockK version` = "1.13.2"
|
||||
`retrofit version` = "2.9.0" // Released: May 20, 2020
|
||||
`retrofit-kotlin-serialization version` = "0.8.0" // Released: Oct 09, 2020
|
||||
`robolectric version` = "4.3.1" // Released: Oct 11, 2019
|
||||
`robolectric version` = "4.8.2" // Released: Oct 11, 2019
|
||||
`viewStateStore version` = "1.4-beta-4" // Released: Mar 02, 2020
|
||||
// endregion
|
||||
}
|
||||
|
|
@ -95,6 +95,7 @@ const val `apache-commons-lang version` = "3.4" // Released: Apr
|
|||
const val `arrow version` = "0.11.0" // Released: Sep 09, 2020
|
||||
const val `butterKnife version` = "10.1.0" // Released: Feb 14, 201
|
||||
const val `firebase-messaging version` = "20.2.4" // Released: Jul 30, 2020
|
||||
const val `desugaring version` = "1.1.5" // Released:
|
||||
const val `gson version` = "2.8.5" // Released: May 22, 201
|
||||
const val `jackson version` = "2.10.2" // Released: Jan 05, 2020
|
||||
const val `jsoup version` = "1.13.1" // Released: Mar 01, 2020
|
||||
|
|
|
|||
|
|
@ -1,24 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2022 Proton AG
|
||||
#
|
||||
# This file is part of Proton Mail.
|
||||
#
|
||||
# Proton Mail is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Proton Mail is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Proton Mail. If not, see https://www.gnu.org/licenses/.
|
||||
#
|
||||
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ plugins {
|
|||
android("tokenautocomplete.example")
|
||||
|
||||
dependencies {
|
||||
coreLibraryDesugaring(
|
||||
`desugaring`
|
||||
)
|
||||
implementation(
|
||||
project(Module.tokenAutoComplete),
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ plugins {
|
|||
android()
|
||||
|
||||
dependencies {
|
||||
coreLibraryDesugaring(
|
||||
`desugaring`
|
||||
)
|
||||
implementation(
|
||||
`kotlin-jdk7`,
|
||||
`appcompat`,
|
||||
|
|
|
|||
Loading…
Reference in New Issue