mirror of
https://github.com/ProtonMail/protoncore_android.git
synced 2026-05-15 09:50:41 +00:00
feat(crypto)!: Switch to GopenPGP from maven-central.
Instead of using GopenPGP from a local sub-folder, we now pull it directly from Maven Central with versioning.
This commit is contained in:
@@ -258,7 +258,6 @@ dependencies {
|
||||
project(Module.domain),
|
||||
project(Module.eventManager),
|
||||
project(Module.featureFlag),
|
||||
project(Module.gopenpgp),
|
||||
project(Module.humanVerification),
|
||||
project(Module.key),
|
||||
project(Module.label),
|
||||
@@ -303,6 +302,9 @@ dependencies {
|
||||
recyclerview,
|
||||
`startup-runtime`,
|
||||
|
||||
// Crypto
|
||||
`android-golib`,
|
||||
|
||||
// Other
|
||||
`serialization-json`,
|
||||
`room-ktx`,
|
||||
|
||||
@@ -86,6 +86,7 @@ dependencies {
|
||||
`kotlin-test-junit`,
|
||||
`mockk-android`,
|
||||
mockWebServer,
|
||||
`android-golib`,
|
||||
|
||||
project(Module.accountRecoveryTest),
|
||||
project(Module.androidInstrumentedTest),
|
||||
@@ -104,7 +105,6 @@ dependencies {
|
||||
project(Module.cryptoValidator),
|
||||
project(Module.eventManager),
|
||||
project(Module.featureFlag),
|
||||
project(Module.gopenpgp),
|
||||
project(Module.humanVerification),
|
||||
project(Module.kotlinUtil),
|
||||
project(Module.key),
|
||||
|
||||
@@ -48,10 +48,9 @@ dependencies {
|
||||
project(Module.kotlinUtil),
|
||||
`android-ktx`,
|
||||
`room-runtime`,
|
||||
`android-golib`,
|
||||
)
|
||||
|
||||
compileOnly(project(Module.gopenpgp))
|
||||
|
||||
testImplementation(
|
||||
junit,
|
||||
`kotlin-test`,
|
||||
@@ -66,16 +65,8 @@ dependencies {
|
||||
project(Module.androidInstrumentedTest),
|
||||
project(Module.androidTest),
|
||||
project(Module.kotlinTest),
|
||||
project(Module.gopenpgp),
|
||||
`android-golib`,
|
||||
`kotlin-test`,
|
||||
`mockk-android`,
|
||||
)
|
||||
}
|
||||
|
||||
dependencyAnalysis {
|
||||
issues {
|
||||
onUnusedDependencies {
|
||||
exclude(Module.gopenpgp)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,6 +53,9 @@ dependencies {
|
||||
project(Module.keyData),
|
||||
project(Module.networkDomain),
|
||||
|
||||
// Crypto
|
||||
`android-golib`,
|
||||
|
||||
// Other
|
||||
`android-work-runtime`,
|
||||
retrofit,
|
||||
@@ -74,19 +77,17 @@ dependencies {
|
||||
project(Module.userDomain),
|
||||
)
|
||||
|
||||
compileOnly(project(Module.gopenpgp))
|
||||
|
||||
androidTestImplementation(project(Module.androidTest)) {
|
||||
exclude(mockk)
|
||||
}
|
||||
|
||||
androidTestImplementation(
|
||||
project(Module.androidInstrumentedTest),
|
||||
project(Module.gopenpgp),
|
||||
project(Module.kotlinTest),
|
||||
junit,
|
||||
`kotlin-test`,
|
||||
`mockk-android`,
|
||||
`android-golib`,
|
||||
project(Module.cryptoAndroid),
|
||||
)
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ dependencies {
|
||||
androidTestImplementation(
|
||||
project(Module.androidInstrumentedTest),
|
||||
project(Module.cryptoAndroid),
|
||||
project(Module.gopenpgp),
|
||||
`android-golib`,
|
||||
`kotlin-test`
|
||||
)
|
||||
|
||||
|
||||
@@ -123,7 +123,6 @@ includeCoreBuild {
|
||||
branch.set("main")
|
||||
// tag.set("1.0.0")
|
||||
// commit.set("commitSha")
|
||||
includeBuild("gopenpgp") // Checkout "proton-libs" in parent dir and include "gopenpgp" build.
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
@@ -102,6 +102,10 @@ public val DependencyHandler.mockWebServer: Any
|
||||
public val DependencyHandler.certificateTransparency: Any
|
||||
get() = dependency("com.appmattus.certificatetransparency", module = "certificatetransparency-android") version `certificate-transparency version`
|
||||
|
||||
// crypto
|
||||
public val DependencyHandler.`android-golib`: Any
|
||||
get() = dependency("me.proton.crypto", module = "android-golib") version `android-golib version`
|
||||
|
||||
// Other
|
||||
public val DependencyHandler.`accompanist-permissions`: Any
|
||||
get() = dependency("com.google.accompanist", module = "accompanist-permissions") version `accompanist version`
|
||||
|
||||
@@ -51,7 +51,6 @@ public object Module {
|
||||
public const val presentationCompose: String = ":presentation-compose"
|
||||
public const val data: String = ":data"
|
||||
public const val dataRoom: String = ":data-room"
|
||||
public const val gopenpgp: String = ":gopenpgp"
|
||||
// endregion
|
||||
|
||||
// region Support
|
||||
|
||||
@@ -112,6 +112,10 @@ public const val `tv-foundation version`: String = "1.0.0-alpha10"
|
||||
public const val `tv-material version`: String = "1.0.0-beta01"
|
||||
// endregion
|
||||
|
||||
// region Crypto
|
||||
public const val `android-golib version`: String = "2.8.2"
|
||||
// endregion
|
||||
|
||||
// region Other
|
||||
public const val `bcrypt version`: String = "0.9.0" // Released: Oct 29, 2019
|
||||
public const val `coil version`: String = "2.4.0"
|
||||
|
||||
@@ -86,7 +86,6 @@ dependencies {
|
||||
project(Module.accountManager),
|
||||
project(Module.accountManagerDataDb),
|
||||
project(Module.cryptoAndroid),
|
||||
project(Module.gopenpgp),
|
||||
project(Module.userSettings),
|
||||
project(Module.accountRecoveryDomain),
|
||||
project(Module.contact),
|
||||
@@ -94,7 +93,8 @@ dependencies {
|
||||
project(Module.kotlinTest),
|
||||
`kotlin-test`,
|
||||
`mockk-android`,
|
||||
turbine
|
||||
turbine,
|
||||
`android-golib`
|
||||
)
|
||||
|
||||
testImplementation(
|
||||
|
||||
Reference in New Issue
Block a user