Merge branch 'main' into telemetry

yasanglass · Apr 2, 2022 · 22296de · 22296de
2 parents 2f2e05f + 4588a2f
commit 22296de
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 23 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -1,7 +1,7 @@
 name: Android CI
 on:   
   push:
-    branches: [ main ]
+    branches: [ main, telemetry ]
   pull_request:
     branches: [ '*' ]
   workflow_dispatch:

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,6 @@ plugins {
     id 'com.google.firebase.crashlytics'
     id 'me.moallemi.advanced-build-version'
     id 'com.adarshr.test-logger' version '3.2.0'
-    id 'com.spotify.ruler'
 }
 
 android {
@@ -164,18 +163,4 @@ dependencies {
     androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
     kaptAndroidTest "com.google.dagger:hilt-android-compiler:$hilt_version"
 
-}
-
-ruler {
-    abi.set("arm64-v8a")
-    locale.set("en")
-    screenDensity.set(480)
-    sdkVersion.set(27)
-    ownershipFile.set(project.layout.projectDirectory.file("ownership.yaml"))
-    defaultOwner.set("third-party")
-}
-
-tasks.named("check").configure {
-    dependsOn("analyzePlayDebugBundle")
-    dependsOn("analyzePlayReleaseBundle")
 }
diff --git a/app/ownership.yaml b/app/ownership.yaml
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,6 @@ buildscript {
         classpath 'com.google.firebase:perf-plugin:1.4.1'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
         classpath 'me.moallemi.gradle:advanced-build-version:2.0.0'
-        classpath "com.spotify.ruler:ruler-gradle-plugin:1.2.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files