Skip to content

Commit cc6cf9e

Browse files
test: Update app_many_tests to AndroidX libraries (#2185)
FTL is deprecating support for the Android Test Orchestrator that is part of the legacy/deprecated Android Test Support libraries. This CL updates the app_many_tests test app to the new AndroidX libraries, as this app is used in integration tests that enable Test Orchestrator. Note, users can still use Android Support and Android Test Support libraries. They just cannot use the legacy Test Orchestrator. Co-authored-by: Michael Zoech <michi.zoech@gmail.com>
1 parent 1bf9b6a commit cc6cf9e

3 files changed

Lines changed: 8 additions & 9 deletions

File tree

test_projects/android/app_many_tests/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
versionCode 1
1414
versionName "1.0"
1515

16-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
16+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}
1818

1919
buildTypes {
@@ -27,10 +27,9 @@ android {
2727
dependencies {
2828
implementation fileTree(dir: "libs", include: ["*.jar"])
2929
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
30-
implementation 'com.android.support:appcompat-v7:28.0.0'
31-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
30+
implementation 'androidx.appcompat:appcompat:1.3.0'
31+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
3232
testImplementation 'junit:junit:4.12'
33-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
34-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
35-
33+
androidTestImplementation 'androidx.test:runner:1.3.0'
34+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
3635
}

test_projects/android/app_many_tests/src/main/java/com/example/app/many/tests/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.app.many.tests
22

3-
import android.support.v7.app.AppCompatActivity
3+
import androidx.appcompat.app.AppCompatActivity
44
import android.os.Bundle
55

66
class MainActivity : AppCompatActivity() {

test_projects/android/app_many_tests/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -15,4 +15,4 @@
1515
app:layout_constraintRight_toRightOf="parent"
1616
app:layout_constraintTop_toTopOf="parent" />
1717

18-
</android.support.constraint.ConstraintLayout>
18+
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)