Merge pull request #8 from stepstone-tech/remove-depreciations-after-bumping-agp-to-v7

Remove depreciations and align to the newest libraries up-to-date on 09.2021

Author: RobertZagorski

app/build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply from: '../ktlint.gradle'
 
 android {
@@ -20,6 +19,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        viewBinding true
+    }
     testOptions {
         execution 'ANDROIDX_TEST_ORCHESTRATOR'
         animationsDisabled = true

app/src/androidTest/java/com/stepstone/xrunner/sample/MainActivityTest.kt

@@ -1,29 +1,34 @@
 package com.stepstone.xrunner.sample
 
+import androidx.lifecycle.Lifecycle
+import androidx.test.core.app.ActivityScenario
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.ActivityTestRule
 import org.hamcrest.Matchers.not
+import org.junit.*
 import org.junit.Assert.assertTrue
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class MainActivityTest {
 
-    @get:Rule
-    val rule = ActivityTestRule(MainActivity::class.java)
+    private lateinit var scenario: ActivityScenario<MainActivity>
+
+    @Before
+    fun launch() {
+        scenario = ActivityScenario.launch(MainActivity::class.java).also {
+            it.moveToState(Lifecycle.State.RESUMED)
+        }
+    }
 
     @Test
     fun dummy_text_should_be_hidden_by_default() {
-        onView(withId(R.id.dummy_text_view)).check(matches(not(isDisplayed())))
+        onView(withId(R.id.dummyTextView)).check(matches(not(isDisplayed())))
     }
 
     @Test
@@ -38,11 +43,16 @@ class MainActivityTest {
         onView(withId(R.id.fab)).perform(click())
 
         // then
-        onView(withId(R.id.dummy_text_view)).check(matches(withText("XRunner")))
+        onView(withId(R.id.dummyTextView)).check(matches(withText("XRunner")))
     }
 
     @Test
     fun failing_test() {
         assertTrue(false)
     }
+
+    @After
+    fun cleanup() {
+        scenario.close()
+    }
 }

app/src/main/java/com/stepstone/xrunner/sample/MainActivity.kt

@@ -3,19 +3,18 @@ package com.stepstone.xrunner.sample
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import android.view.View
-import kotlinx.android.synthetic.main.activity_main.fab
-import kotlinx.android.synthetic.main.activity_main.toolbar
-import kotlinx.android.synthetic.main.content_main.dummy_text_view
+import com.stepstone.xrunner.sample.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        setSupportActionBar(toolbar)
+        val binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setSupportActionBar(binding.toolbar)
 
-        fab.setOnClickListener {
-            dummy_text_view.visibility = View.VISIBLE
+        binding.fab.setOnClickListener {
+            binding.content.dummyTextView.visibility = View.VISIBLE
         }
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }

app/src/main/res/layout/activity_main.xml

@@ -20,7 +20,8 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <include layout="@layout/content_main" />
+    <include layout="@layout/content_main"
+        android:id="@+id/content"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"

app/src/main/res/layout/content_main.xml

@@ -9,7 +9,7 @@
     tools:showIn="@layout/activity_main">
 
     <TextView
-        android:id="@+id/dummy_text_view"
+        android:id="@+id/dummyTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"

build.gradle

@@ -2,13 +2,10 @@
 
 buildscript {
     ext.KOTLIN_VERSION = '1.5.21'
-    ext.ANDROID_GRADLE_PLUGIN_VERSION = '7.0.1'
+    ext.ANDROID_GRADLE_PLUGIN_VERSION = '7.0.2'
     ext.DOKKA_VERSION = '1.5.0'
     repositories {
         google()
-        maven {
-            url 'https://dl.bintray.com/kotlin/kotlin-eap'
-        }
         mavenCentral()
     }
     dependencies {
@@ -39,9 +36,9 @@ configure(allprojects) {
         TEST_EXT_VERSION                    = '1.1.3'
         TEST_ORCHESTRATOR_VERSION           = '1.4.0'
         ESPRESSO_VERSION                    = '3.4.0'
-        APPCOMPAT_VERSION                   = '1.1.0'
-        MATERIAL_VERSION                    = '1.1.0'
-        CONSTRAINT_VERSION                  = '1.1.3'
+        APPCOMPAT_VERSION                   = '1.3.1'
+        MATERIAL_VERSION                    = '1.4.0'
+        CONSTRAINT_VERSION                  = '2.1.1'
     }
 }
 

gradle.properties

@@ -14,4 +14,3 @@ org.gradle.jvmargs=-Xmx1536m
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 android.useAndroidX=true
-android.enableJetifier=true