mirror of
https://github.com/nextcloud/android.git
synced 2024-11-22 05:05:31 +03:00
remove gplay.gradle, use gplayImplementation instead
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
parent
88605985a0
commit
ebf59510fc
3 changed files with 5 additions and 16 deletions
13
build.gradle
13
build.gradle
|
@ -91,16 +91,6 @@ def versionMinor = 20
|
||||||
def versionPatch = 0
|
def versionPatch = 0
|
||||||
def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable
|
def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable
|
||||||
|
|
||||||
for (TaskExecutionRequest tr : getGradle().getStartParameter().getTaskRequests()) {
|
|
||||||
for (String arg : tr.args) {
|
|
||||||
// any gplay, but only exact "build", as e.g. buildGeneric shall not apply gplay.grade
|
|
||||||
if (arg.contains("Gplay") || arg.contains("lint") || arg.contains("ExecuteScreenshot") || arg == "build") {
|
|
||||||
apply from: 'gplay.gradle'
|
|
||||||
System.console().println("Applying gplay.gradle")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
compileSdkVersion 31
|
compileSdkVersion 31
|
||||||
|
@ -370,6 +360,9 @@ dependencies {
|
||||||
androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2')
|
androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2')
|
||||||
|
|
||||||
implementation "com.github.stateless4j:stateless4j:2.6.0"
|
implementation "com.github.stateless4j:stateless4j:2.6.0"
|
||||||
|
|
||||||
|
// upon each update first test: new registration, receive push
|
||||||
|
gplayImplementation "com.google.firebase:firebase-messaging:20.1.3"
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations.all {
|
configurations.all {
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
dependencies {
|
|
||||||
// upon each update first test: new registration, receive push
|
|
||||||
implementation "com.google.firebase:firebase-messaging:20.1.3"
|
|
||||||
}
|
|
|
@ -56,12 +56,12 @@ end
|
||||||
|
|
||||||
# run Lint
|
# run Lint
|
||||||
puts "running Lint..."
|
puts "running Lint..."
|
||||||
system './gradlew clean lint 1>/dev/null'
|
system './gradlew clean lintGplayDebug 1>/dev/null'
|
||||||
|
|
||||||
# confirm that Lint ran w/out error
|
# confirm that Lint ran w/out error
|
||||||
result = $?.to_i
|
result = $?.to_i
|
||||||
if result != 0
|
if result != 0
|
||||||
puts "FAIL: failed to run ./gradlew clean lint"
|
puts "FAIL: failed to run ./gradlew clean lintGplayDebug"
|
||||||
exit 1
|
exit 1
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue