upgrade AGP and Kotlin version (#416)

* upgrade AGP and Kotlin version * update java version for github action to java 11 * fix instrumentation test setup * fix pick result to pass the test * remove unused code * skip lint on build * set max metaspace to 1g * fix wrong config
esafirm · Oct 26, 2022 · ffeac4a · ffeac4a
1 parent 5979023
commit ffeac4a
Show file tree

Hide file tree

Showing 17 changed files with 72 additions and 76 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -11,10 +11,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: set up JDK 11
+        uses: actions/setup-java@v2.4.0
         with:
-          java-version: 1.8
+          distribution: adopt-openj9
+          java-version: '11'
 
       - name: Cache Gradle
         uses: actions/cache@v2
@@ -28,7 +29,7 @@ jobs:
             gradle-
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build -x lint
 
       - name: Build test
         run: ./gradlew sample:assembleAndroidTest

diff --git a/build.gradle b/build.gradle
@@ -1,22 +1,21 @@
 buildscript {
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.6.21'
     ext.core_ktx_version = '1.3.2'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 ext {
     sdk = [
-            compileSdk: 33,
-            targetSdk : 30,
-            minSdk    : 21
+        compileSdk: 33,
+        targetSdk : 33,
+        minSdk    : 21
     ]
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.useAndroidX=true
+android.useAndroidX=true
+org.gradle.jvmargs=-XX:MaxMetaSpaceSize=1g
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     final sdk = rootProject.ext.sdk
@@ -11,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion sdk.minSdk
         targetSdkVersion sdk.targetSdk
-        versionCode 1
-        versionName "1.0"
     }
 
     buildFeatures {
@@ -31,16 +28,16 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
+    lint {
         abortOnError false
     }
 
     resourcePrefix "ef_"
 }
 
-task sourcesJar(type: Jar) {
+tasks.register("sourcesJar", Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 artifacts {

diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.kt
@@ -41,22 +41,18 @@ class ImagePickerActivity : AppCompatActivity(), ImagePickerInteractionListener
     private val startForCameraResult = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
     ) { result: ActivityResult ->
-        if (result.resultCode == Activity.RESULT_OK) {
-            val intent = result.data
-            // Handle the Intent
-            if (intent?.extras?.isEmpty == true) {
-                cameraModule.removeImage(this)
-                setResult(RESULT_CANCELED)
-                finish()
-            } else {
-                cameraModule.getImage(this, intent) { images ->
-                    finishPickImages(ImagePickerUtils.createResultIntent(images))
-                }
-            }
-        } else {
+        val resultCode = result.resultCode
+        if (resultCode == Activity.RESULT_CANCELED) {
             cameraModule.removeImage(this)
             setResult(RESULT_CANCELED)
             finish()
+            return@registerForActivityResult
+        }
+        if (resultCode == Activity.RESULT_OK) {
+            cameraModule.getImage(this, result.data) { images ->
+                val resultIntent = ImagePickerUtils.createResultIntent(images)
+                finishPickImages(resultIntent)
+            }
         }
     }
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdkVersion sdk.compileSdk
 
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
 
     defaultConfig {
@@ -58,7 +58,10 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
     androidTestImplementation "androidx.test:runner:$runnerVersion"
     androidTestImplementation "androidx.test:rules:$runnerVersion"
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+    androidTestImplementation "androidx.test:core:1.5.0-beta01"
     androidTestImplementation('com.adevinta.android:barista:3.10.0') {
         exclude group: 'org.jetbrains.kotlin'
+        exclude group: 'org.hamcrest'
     }
 }
diff --git a/sample/src/androidTest/AndroidManifest.xml b/sample/src/androidTest/AndroidManifest.xml
@@ -3,5 +3,4 @@
     package="com.esafirm.sample">
 
     <uses-sdk tools:overrideLibrary="com.adevinta.android.barista,android_libs.ub_uiautomator" />
-
 </manifest>
diff --git a/sample/src/androidTest/java/com/esafirm/sample/CameraOnPickerTest.kt b/sample/src/androidTest/java/com/esafirm/sample/CameraOnPickerTest.kt
@@ -5,26 +5,26 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
 import androidx.test.espresso.intent.Intents
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
-import com.esafirm.sample.utils.ViewAsserts
-import com.esafirm.sample.utils.Views
 import com.adevinta.android.barista.intents.BaristaIntents.mockAndroidCamera
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions
+import com.esafirm.sample.utils.ViewAsserts
+import com.esafirm.sample.utils.Views
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @LargeTest
-@RunWith(AndroidJUnit4ClassRunner::class)
+@RunWith(AndroidJUnit4::class)
 class CameraOnPickerTest {
 
     @Rule
     @JvmField
-    val testRule = ActivityTestRule(MainActivity::class.java)
+    val testRule = ActivityScenarioRule(MainActivity::class.java)
 
     @Rule
     @JvmField

diff --git a/sample/src/androidTest/java/com/esafirm/sample/CameraOnlyTest.kt b/sample/src/androidTest/java/com/esafirm/sample/CameraOnlyTest.kt
@@ -10,28 +10,27 @@ import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intending
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
-import androidx.test.runner.AndroidJUnit4
-import com.esafirm.sample.matchers.hasDrawable
-import com.esafirm.sample.utils.ViewAsserts
-import com.esafirm.sample.utils.Views
 import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
 import com.adevinta.android.barista.intents.BaristaIntents.mockAndroidCamera
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.esafirm.sample.matchers.hasDrawable
+import com.esafirm.sample.utils.ViewAsserts
+import com.esafirm.sample.utils.Views
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @LargeTest
-@RunWith(AndroidJUnit4ClassRunner::class)
+@RunWith(AndroidJUnit4::class)
 class CameraOnlyTest {
 
     @Rule
     @JvmField
-    var testRule = ActivityTestRule(MainActivity::class.java)
+    var testRule = ActivityScenarioRule(MainActivity::class.java)
 
     @Rule
     @JvmField

diff --git a/sample/src/androidTest/java/com/esafirm/sample/CustomUiTest.kt b/sample/src/androidTest/java/com/esafirm/sample/CustomUiTest.kt
@@ -4,25 +4,24 @@ package com.esafirm.sample
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
-import androidx.test.runner.AndroidJUnit4
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import com.esafirm.sample.utils.ViewAsserts
 import com.esafirm.sample.utils.Views
-import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @LargeTest
-@RunWith(AndroidJUnit4ClassRunner::class)
+@RunWith(AndroidJUnit4::class)
 class CustomUiTest {
 
     @Rule
     @JvmField
-    var testRule = ActivityTestRule(MainActivity::class.java)
+    var testRule = ActivityScenarioRule(MainActivity::class.java)
 
     @Rule
     @JvmField

diff --git a/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt b/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt
@@ -4,24 +4,24 @@ package com.esafirm.sample
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import com.esafirm.sample.utils.ViewAsserts
 import com.esafirm.sample.utils.Views
-import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @LargeTest
-@RunWith(AndroidJUnit4ClassRunner::class)
+@RunWith(AndroidJUnit4::class)
 class PickImageFolderMode {
 
     @Rule
     @JvmField
-    var mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+    var mActivityTestRule = ActivityScenarioRule(MainActivity::class.java)
 
     @Rule
     @JvmField

diff --git a/sample/src/androidTest/java/com/esafirm/sample/PickImageFragmentTest.kt b/sample/src/androidTest/java/com/esafirm/sample/PickImageFragmentTest.kt
@@ -3,25 +3,25 @@ package com.esafirm.sample
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
-import com.esafirm.sample.utils.Views
 import com.adevinta.android.barista.assertion.BaristaImageViewAssertions.assertHasAnyDrawable
 import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.esafirm.sample.utils.Views
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @LargeTest
-@RunWith(AndroidJUnit4ClassRunner::class)
+@RunWith(AndroidJUnit4::class)
 class PickImageFragmentTest {
 
     @Rule
     @JvmField
-    val mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+    val mActivityTestRule = ActivityScenarioRule(MainActivity::class.java)
 
     @Rule
     @JvmField

diff --git a/sample/src/androidTest/java/com/esafirm/sample/PickImageSingleTest.kt b/sample/src/androidTest/java/com/esafirm/sample/PickImageSingleTest.kt
@@ -4,24 +4,24 @@ package com.esafirm.sample
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import com.esafirm.sample.utils.ViewAsserts
 import com.esafirm.sample.utils.Views
-import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @LargeTest
-@RunWith(AndroidJUnit4ClassRunner::class)
+@RunWith(AndroidJUnit4::class)
 class PickImageSingleTest {
 
     @Rule
     @JvmField
-    var mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+    var mActivityTestRule = ActivityScenarioRule(MainActivity::class.java)
 
     @Rule
     @JvmField

diff --git a/sample/src/androidTest/java/com/esafirm/sample/PickImageTest.kt b/sample/src/androidTest/java/com/esafirm/sample/PickImageTest.kt
@@ -10,24 +10,24 @@ import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
 import androidx.test.espresso.matcher.ViewMatchers.isClickable
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import com.esafirm.sample.matchers.hasDrawable
 import com.esafirm.sample.utils.Views
-import org.hamcrest.Matchers.allOf
+import org.hamcrest.CoreMatchers.allOf
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @LargeTest
-@RunWith(AndroidJUnit4ClassRunner::class)
+@RunWith(AndroidJUnit4::class)
 class PickImageTest {
 
     @Rule
     @JvmField
-    var mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+    var mActivityTestRule = ActivityScenarioRule(MainActivity::class.java)
 
     @Rule
     @JvmField
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,4 @@
		package="com.esafirm.sample">

		<uses-sdk tools:overrideLibrary="com.adevinta.android.barista,android_libs.ub_uiautomator" />

		</manifest>