mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-24 00:37:47 +00:00
Require command line arg to include huawei dependencies
This commit is contained in:
parent
ed7ce36402
commit
4c8f38df72
@ -41,6 +41,16 @@ def abiPostFix = ['armeabi-v7a' : 1,
|
||||
'x86_64' : 4,
|
||||
'universal' : 5]
|
||||
|
||||
tasks.register('checkHuaweiEnabled') {
|
||||
doFirst {
|
||||
if (!project.hasProperty('huawei')) {
|
||||
def message = 'Huawei is not enabled. Please add -Phuawei command line arg. See README.'
|
||||
logger.error(message)
|
||||
throw new GradleException(message)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion androidCompileSdkVersion
|
||||
namespace 'network.loki.messenger'
|
||||
@ -143,6 +153,7 @@ android {
|
||||
buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
|
||||
buildConfigField "org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.HUAWEI"
|
||||
buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
|
||||
|
||||
}
|
||||
|
||||
website {
|
||||
@ -180,6 +191,12 @@ android {
|
||||
dataBinding true
|
||||
viewBinding true
|
||||
}
|
||||
|
||||
applicationVariants.all { variant ->
|
||||
if (variant.flavorName == 'huawei') {
|
||||
variant.preBuild.dependsOn checkHuaweiEnabled
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@ -213,7 +230,7 @@ dependencies {
|
||||
exclude group: 'com.google.firebase', module: 'firebase-analytics'
|
||||
exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
|
||||
}
|
||||
huaweiImplementation 'com.huawei.hms:push:6.7.0.300'
|
||||
if (project.hasProperty('huawei')) huaweiImplementation 'com.huawei.hms:push:6.7.0.300'
|
||||
implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
|
||||
implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
|
||||
implementation 'org.conscrypt:conscrypt-android:2.0.0'
|
||||
|
@ -4,6 +4,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
maven { url 'https://developer.huawei.com/repo/' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath "com.android.tools.build:gradle:$gradlePluginVersion"
|
||||
classpath files('libs/gradle-witness.jar')
|
||||
@ -13,7 +14,7 @@ buildscript {
|
||||
classpath files('libs/gradle-witness.jar')
|
||||
classpath "com.squareup:javapoet:1.13.0"
|
||||
classpath "com.google.dagger:hilt-android-gradle-plugin:$daggerVersion"
|
||||
classpath 'com.huawei.agconnect:agcp:1.6.0.300'
|
||||
if (project.hasProperty('huawei')) classpath 'com.huawei.agconnect:agcp:1.6.0.300'
|
||||
}
|
||||
}
|
||||
|
||||
@ -57,7 +58,7 @@ allprojects {
|
||||
}
|
||||
jcenter()
|
||||
maven { url "https://jitpack.io" }
|
||||
maven { url 'https://developer.huawei.com/repo/' }
|
||||
if (project.hasProperty('huawei')) maven { url 'https://developer.huawei.com/repo/' }
|
||||
}
|
||||
|
||||
project.ext {
|
||||
|
Loading…
x
Reference in New Issue
Block a user