diff --git a/android/lib/build.gradle b/android/lib/build.gradle index 56796397..fe85da87 100644 --- a/android/lib/build.gradle +++ b/android/lib/build.gradle @@ -8,7 +8,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } buildTypes { @@ -17,17 +16,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - lintOptions { - abortOnError false - } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' - api ('com.walmartlabs.ern:container-movies-reloaded:1.0.0') {changing=true} - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation ('com.walmartlabs.ern:container-movies-reloaded:1.0.0') {changing=true} } diff --git a/android/moviesreloaded/build.gradle b/android/moviesreloaded/build.gradle index 62fd80b5..f0adfd59 100644 --- a/android/moviesreloaded/build.gradle +++ b/android/moviesreloaded/build.gradle @@ -3,42 +3,26 @@ apply from: 'ern.gradle' android { compileSdkVersion 28 - + buildToolsVersion = '28.0.3' defaultConfig { applicationId "com.walmartlabs.moviesreloaded" minSdkVersion 23 targetSdkVersion 28 versionCode 1 versionName "1.0" - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - compileOptions { - sourceCompatibility = '1.8' - targetCompatibility = '1.8' - } - buildToolsVersion = '28.0.3' - } dependencies { - api project(":lib") - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' - implementation 'com.google.android.material:material:1.0.0' - - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'com.google.android.material:material:1.1.0' + implementation ('com.walmartlabs.ern:container-movies-reloaded:1.0.0') {changing=true} } diff --git a/android/moviesreloaded/src/androidTest/java/com/walmartlabs/moviesreloaded/ExampleInstrumentedTest.java b/android/moviesreloaded/src/androidTest/java/com/walmartlabs/moviesreloaded/ExampleInstrumentedTest.java deleted file mode 100644 index e496acb9..00000000 --- a/android/moviesreloaded/src/androidTest/java/com/walmartlabs/moviesreloaded/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.walmartlabs.moviesreloaded; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("com.walmartlabs.moviesreloaded", appContext.getPackageName()); - } -} diff --git a/android/moviesreloaded/src/main/res/layout/activity_main.xml b/android/moviesreloaded/src/main/res/layout/activity_main.xml index 034cf752..380e5158 100644 --- a/android/moviesreloaded/src/main/res/layout/activity_main.xml +++ b/android/moviesreloaded/src/main/res/layout/activity_main.xml @@ -12,7 +12,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawableTint="#005C1818" - android:gravity="center_horizontal" android:onClick="handleButtonClick" android:text="@string/experience_default" android:textAllCaps="false" /> diff --git a/android/moviesreloaded/src/test/java/com/walmartlabs/moviesreloaded/ExampleUnitTest.java b/android/moviesreloaded/src/test/java/com/walmartlabs/moviesreloaded/ExampleUnitTest.java deleted file mode 100644 index 30e3842a..00000000 --- a/android/moviesreloaded/src/test/java/com/walmartlabs/moviesreloaded/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.walmartlabs.moviesreloaded; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/package.json b/package.json index be523979..a14a7832 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "root": "android", "dependencies": [ "androidx.appcompat:appcompat:1.1.0", - "androidx.lifecycle:lifecycle-extensions:2.1.0", + "androidx.lifecycle:lifecycle-extensions:2.2.0", "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" ], "copy": [