Fix various test and lint errors

* Fix test and lint errors in all samples * Update all samples to the latest Gradle plugin version
JaesungMoon · Mar 6, 2020 · 60e8cf1 · 60e8cf1
1 parent 3e50358
commit 60e8cf1
Show file tree

Hide file tree

Showing 29 changed files with 52 additions and 194 deletions.
diff --git a/Camera2Basic/app/build.gradle b/Camera2Basic/app/build.gradle
@@ -47,17 +47,6 @@ android {
         }
     }
 
-    // Set the source of tests to same for both Unit and Instrumented tests
-    sourceSets {
-        String sharedTestDir = 'src/test/java'
-        test {
-            java.srcDir sharedTestDir
-        }
-        androidTest {
-            java.srcDir sharedTestDir
-        }
-    }
-
     // Necessary for Robolectric (Unit tests)
     testOptions.unitTests.includeAndroidResources = true
 }
@@ -66,17 +55,17 @@ dependencies {
     implementation project(':common')
 
     // Kotlin lang
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
 
     // App compat and UI things
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-rc03'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
     implementation "androidx.viewpager2:viewpager2:1.0.0"
 
     // Navigation library
-    def nav_version = "2.1.0"
+    def nav_version = '2.2.1'
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
@@ -92,7 +81,7 @@ dependencies {
     testImplementation 'androidx.test:rules:1.2.0'
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    testImplementation "org.robolectric:robolectric:4.3.1"
+    testImplementation 'org.robolectric:robolectric:4.3.1'
 
     // Instrumented testing
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

diff --git a/Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/CameraFragment.kt b/Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/CameraFragment.kt
@@ -154,7 +154,7 @@ class CameraFragment : Fragment() {
 
         // Used to rotate the output media to match device orientation
         relativeOrientation = OrientationLiveData(requireContext(), characteristics).apply {
-            observe(this@CameraFragment, Observer {
+            observe(viewLifecycleOwner, Observer {
                 orientation -> Log.d(TAG, "Orientation changed: $orientation")
             })
         }

diff --git a/Camera2Basic/app/src/test/java/com/example/android/camera2/basic/InstrumentedTests.kt b/Camera2Basic/app/src/test/java/com/example/android/camera2/basic/InstrumentedTests.kt
@@ -18,6 +18,7 @@ package com.example.android.camera2.basic
 
 import android.Manifest
 import android.content.Context
+import android.os.Build
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
@@ -27,6 +28,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
+
 @RunWith(AndroidJUnit4::class)
 class MainInstrumentedTest {
 

diff --git a/Camera2Basic/build.gradle b/Camera2Basic/build.gradle
@@ -26,9 +26,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Camera2Basic/gradle/wrapper/gradle-wrapper.properties b/Camera2Basic/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 27 14:00:11 AEST 2019
+#Thu Mar 05 15:31:27 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Camera2SlowMotion/app/build.gradle b/Camera2SlowMotion/app/build.gradle
@@ -66,16 +66,16 @@ dependencies {
     implementation project(':common')
 
     // Kotlin lang
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
 
     // App compat and UI things
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-rc03'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
 
     // Navigation library
-    def nav_version = "2.1.0"
+    def nav_version = "2.2.1"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 

diff --git a/Camera2SlowMotion/app/src/main/AndroidManifest.xml b/Camera2SlowMotion/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:icon="@drawable/ic_launcher"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
 
         <activity
             android:name="com.example.android.camera2.slowmo.CameraActivity"

diff --git a/...owMotion/app/src/main/java/com/example/android/camera2/slowmo/fragments/CameraFragment.kt b/...owMotion/app/src/main/java/com/example/android/camera2/slowmo/fragments/CameraFragment.kt
@@ -220,7 +220,7 @@ class CameraFragment : Fragment() {
 
         // Used to rotate the output media to match device orientation
         relativeOrientation = OrientationLiveData(requireContext(), characteristics).apply {
-            observe(this@CameraFragment, Observer {
+            observe(viewLifecycleOwner, Observer {
                 orientation -> Log.d(TAG, "Orientation changed: $orientation")
             })
         }

diff --git a/Camera2SlowMotion/app/src/main/res/drawable/ic_photo.xml b/Camera2SlowMotion/app/src/main/res/drawable/ic_photo.xml
diff --git a/Camera2SlowMotion/app/src/main/res/layout/activity_camera.xml b/Camera2SlowMotion/app/src/main/res/layout/activity_camera.xml
@@ -14,20 +14,15 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<FrameLayout
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/fragment_container"
+    android:name="androidx.navigation.fragment.NavHostFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true"
-    tools:context=".CameraActivity">
-
-    <fragment
-        android:id="@+id/fragment_container"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:navGraph="@navigation/nav_graph" />
-</FrameLayout>
+    app:defaultNavHost="true"
+    app:navGraph="@navigation/nav_graph"
+    tools:context=".CameraActivity" />
diff --git a/Camera2SlowMotion/build.gradle b/Camera2SlowMotion/build.gradle
@@ -26,9 +26,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Camera2SlowMotion/gradle/wrapper/gradle-wrapper.properties b/Camera2SlowMotion/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 27 14:00:11 AEST 2019
+#Thu Mar 05 16:15:48 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Camera2VideoJava/Application/build.gradle b/Camera2VideoJava/Application/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 

diff --git a/Camera2VideoJava/gradle/wrapper/gradle-wrapper.properties b/Camera2VideoJava/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Mar 06 10:33:53 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Camera2VideoKotlin/build.gradle b/Camera2VideoKotlin/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/Camera2VideoKotlin/gradle/wrapper/gradle-wrapper.properties b/Camera2VideoKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Mar 06 10:32:20 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/CameraXBasic/app/build.gradle b/CameraXBasic/app/build.gradle
@@ -47,17 +47,6 @@ android {
        }
     }
 
-    // Set the source of tests to same for both Unit and Instrumented tests
-    sourceSets {
-        String sharedTestDir = 'src/test/java'
-        test {
-            java.srcDir sharedTestDir
-        }
-        androidTest {
-            java.srcDir sharedTestDir
-        }
-    }
-
     // Necessary for Robolectric (Unit tests)
     testOptions {
         unitTests {
@@ -100,14 +89,14 @@ dependencies {
 
     // Glide
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    kapt 'com.github.bumptech.glide:compiler:4.10.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
     // Unit testing
     testImplementation 'androidx.test.ext:junit:1.1.1'
     testImplementation 'androidx.test:rules:1.2.0'
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    testImplementation "org.robolectric:robolectric:4.3.1"
+    testImplementation 'org.robolectric:robolectric:4.3.1'
 
     // Instrumented testing
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

diff --git a/CameraXBasic/app/src/main/AndroidManifest.xml b/CameraXBasic/app/src/main/AndroidManifest.xml
@@ -32,9 +32,9 @@
     <application
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:name=".CameraXBasic"
         android:label="@string/app_name"
-        android:allowBackup="true">
+        android:allowBackup="true"
+        tools:ignore="AllowBackup">
 
         <activity
             android:name=".MainActivity"

diff --git a/CameraXBasic/app/src/main/java/com/android/example/cameraxbasic/CameraXBasic.kt b/CameraXBasic/app/src/main/java/com/android/example/cameraxbasic/CameraXBasic.kt
diff --git a/CameraXBasic/app/src/main/res/drawable/ic_switch.xml b/CameraXBasic/app/src/main/res/drawable/ic_switch.xml
@@ -15,11 +15,13 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:tint="@color/selector_ic"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="46.0"
-    android:viewportHeight="46.0">
+    android:viewportHeight="46.0"
+    tools:ignore="VectorRaster">
     <path android:fillAlpha="0" android:fillColor="#D8D8D8"
         android:fillType="evenOdd" android:pathData="M-4,-4h54v54h-54z"
         android:strokeColor="#00000000" android:strokeWidth="1"/>

diff --git a/CameraXBasic/app/src/main/res/layout/activity_main.xml b/CameraXBasic/app/src/main/res/layout/activity_main.xml
@@ -14,21 +14,15 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<FrameLayout
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/fragment_container"
+    android:name="androidx.navigation.fragment.NavHostFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true"
-    tools:context=".MainActivity">
-
-    <fragment
-        android:id="@+id/fragment_container"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:navGraph="@navigation/nav_graph" />
-
-</FrameLayout>
+    app:defaultNavHost="true"
+    app:navGraph="@navigation/nav_graph"
+    tools:context=".MainActivity"/>
diff --git a/CameraXBasic/app/src/main/res/values-v28/styles.xml b/CameraXBasic/app/src/main/res/values-v28/styles.xml
@@ -18,13 +18,6 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:immersive">true</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 

diff --git a/CameraXBasic/app/src/main/res/values/styles.xml b/CameraXBasic/app/src/main/res/values/styles.xml
@@ -18,9 +18,6 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:immersive">true</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowTranslucentStatus">true</item>

diff --git a/CameraXBasic/build.gradle b/CameraXBasic/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1"
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ buildscript { @@
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.3.2'
+            classpath 'com.android.tools.build:gradle:3.6.1'
         }
     }
@@ Expand Down @@