Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove and update dependencies #113

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove and update dependencies #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions android/lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
24 changes: 4 additions & 20 deletions android/moviesreloaded/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
}
26 changes: 0 additions & 26 deletions ...reloaded/src/androidTest/java/com/walmartlabs/moviesreloaded/ExampleInstrumentedTest.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion android/moviesreloaded/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
17 changes: 0 additions & 17 deletions android/moviesreloaded/src/test/java/com/walmartlabs/moviesreloaded/ExampleUnitTest.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down