Remove and update dependencies

electrode-io · Oct 12, 2020 · 12308ee · 12308ee
1 parent ff033a6
commit 12308ee
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 71 deletions.
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
@@ -20,18 +20,15 @@ android {
             multiDexEnabled true
         }
     }
-    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}
-    androidTestImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation ('com.walmartlabs.ern:container-movies-reloaded:1.0.0') {changing=true}
     androidTestImplementation 'androidx.multidex:multidex:2.0.0'
+    androidTestImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
     androidTestImplementation 'androidx.test:core:1.3.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test:runner:1.3.0'

diff --git 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/...reloaded/src/androidTest/java/com/walmartlabs/moviesreloaded/ExampleInstrumentedTest.java b/...reloaded/src/androidTest/java/com/walmartlabs/moviesreloaded/ExampleInstrumentedTest.java
diff --git 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
diff --git 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": [