瀏覽代碼

remove gplay.gradle, use gplayImplementation instead

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 3 年之前
父節點
當前提交
ebf59510fc
共有 3 個文件被更改,包括 5 次插入16 次删除
  1. 3 10
      build.gradle
  2. 0 4
      gplay.gradle
  3. 2 2
      scripts/analysis/lint-up.rb

+ 3 - 10
build.gradle

@@ -91,16 +91,6 @@ def versionMinor = 20
 def versionPatch = 0
 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 {
 
     compileSdkVersion 31
@@ -370,6 +360,9 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2')
 
     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 {

+ 0 - 4
gplay.gradle

@@ -1,4 +0,0 @@
-dependencies {
-    // upon each update first test: new registration, receive push
-    implementation "com.google.firebase:firebase-messaging:20.1.3"
-}

+ 2 - 2
scripts/analysis/lint-up.rb

@@ -56,12 +56,12 @@ end
 
 # run 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
 result = $?.to_i
 if result != 0
-    puts "FAIL: failed to run ./gradlew clean lint"
+    puts "FAIL: failed to run ./gradlew clean lintGplayDebug"
     exit 1
 end