Merge pull request #99 from yamasa/master

Update libraries.
line · Jul 17, 2021 · 427ccbb · 427ccbb
2 parents c509a69 + 35e7849
commit 427ccbb
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     // Make sure to use the same AGP as the main project.
-    def androidGradlePlugin = '4.2.1'
+    def androidGradlePlugin = '4.2.2'
     /**
      * Calculates the right lint version for the provided AGP version. AGP is tightly coupled with
      * Android Lint because it implements LintClient. The formula to calculate the lint version
@@ -19,31 +19,31 @@ buildscript {
         compileSdk              : 30,
         minSdk                  : 14,
         targetSdk               : 30,
-        kotlin                  : '1.5.10',
-        kotlinCoroutines        : '1.5.0',
+        kotlin                  : '1.5.21',
+        kotlinCoroutines        : '1.5.1',
         kotlinMetadataJvm       : '0.3.0',
-        ksp                     : '1.5.10-1.0.0-beta01',
+        ksp                     : '1.5.21-1.0.0-beta05',
         androidxAppcompat       : '1.3.0',
         androidxConstraintlayout: '2.0.4',
-        androidxFragment        : '1.3.4',
+        androidxFragment        : '1.3.5',
         androidxLifecycle       : '2.3.1',
         androidxNavigation      : '2.3.5',
         androidxRoom            : '2.3.0',
-        androidxTestCore        : '1.3.0',
-        androidxTestRunner      : '1.3.0',
-        androidxTestJunit       : '1.1.2',
-        androidxTestEspresso    : '3.3.0',
+        androidxTestCore        : '1.4.0',
+        androidxTestRunner      : '1.4.0',
+        androidxTestJunit       : '1.1.3',
+        androidxTestEspresso    : '3.4.0',
         autoService             : '1.0',
         okhttp                  : '4.9.1',
-        dagger                  : '2.36',
-        kotlinPoet              : '1.8.0',
+        dagger                  : '2.37',
+        kotlinPoet              : '1.9.0',
         thrift                  : '0.13.0',
         dexmaker                : '2.28.1',
-        mockito                 : '3.10.0',
+        mockito                 : '3.11.1',
         mockitoKotlin           : '3.2.0',
-        mockk                   : '1.11.0',
-        robolectric             : '4.5.1',
-        dokka                   : '1.4.32',
+        mockk                   : '1.12.0',
+        robolectric             : '4.6.1',
+        dokka                   : '1.5.0',
     ]
     repositories {
         google()

diff --git a/dagger_sample_app/src/test/java/com/linecorp/lich/sample/mvvm/MvvmSampleActivityTest.kt b/dagger_sample_app/src/test/java/com/linecorp/lich/sample/mvvm/MvvmSampleActivityTest.kt
@@ -34,10 +34,13 @@ import io.mockk.verify
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
 
+// Workaround for https://github.com/robolectric/robolectric/issues/6593
+@Config(instrumentedPackages = ["androidx.loader.content"])
 @RunWith(AndroidJUnit4::class)
 class MvvmSampleActivityTest {
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

diff --git a/sample_app/src/test/java/com/linecorp/lich/sample/mvvm/MvvmSampleActivityTest.kt b/sample_app/src/test/java/com/linecorp/lich/sample/mvvm/MvvmSampleActivityTest.kt
@@ -34,10 +34,13 @@ import io.mockk.verify
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
 
+// Workaround for https://github.com/robolectric/robolectric/issues/6593
+@Config(instrumentedPackages = ["androidx.loader.content"])
 @RunWith(AndroidJUnit4::class)
 class MvvmSampleActivityTest {
 

diff --git a/viewmodel-test-mockk/src/androidTest/AndroidManifest.xml b/viewmodel-test-mockk/src/androidTest/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.linecorp.lich.viewmodel.test.mockk">
 
+    <uses-sdk tools:overrideLibrary="io.mockk,io.mockk.proxy.android" />
     <application>
         <activity android:name=".TestActivity" />
     </application>