diff --git a/build.gradle b/build.gradle index 6f7938d7..2e888291 100644 --- a/build.gradle +++ b/build.gradle @@ -46,5 +46,5 @@ ext { minSdkVersion = 19 targetSdkVersion = 28 buildToolsVersion = '28.0.3' - supportLibraryVersion = '1.0.0' + supportLibraryVersion = '1.0.2' } diff --git a/cardview-v7/build.gradle b/cardview-v7/build.gradle index 1da2e776..04fff1f9 100644 --- a/cardview-v7/build.gradle +++ b/cardview-v7/build.gradle @@ -47,7 +47,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "androidx.cardview:cardview:${rootProject.ext.supportLibraryVersion}" + implementation "androidx.cardview:cardview:1.0.0" api "androidx.appcompat:appcompat:${rootProject.ext.supportLibraryVersion}" api project(path: ':proteus-core') diff --git a/demo/build.gradle b/demo/build.gradle index 33b7e04a..309e448e 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -64,15 +64,12 @@ android { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "androidx.appcompat:appcompat:${rootProject.ext.supportLibraryVersion}" - implementation "androidx.support:design:${rootProject.ext.supportLibraryVersion}" - implementation 'com.github.tony19:logback-android-core:1.1.1-3' - implementation 'com.github.tony19:logback-android-classic:1.1.1-3' - implementation 'com.squareup.retrofit2:retrofit:2.1.0' - implementation 'com.squareup.retrofit2:converter-gson:2.1.0' - implementation('com.github.bumptech.glide:glide:4.7.1') { - exclude group: "androidx.support" - } - annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1' + implementation "com.google.android.material:material:1.0.0" + implementation 'com.squareup.retrofit2:retrofit:2.5.0' + implementation 'com.squareup.retrofit2:converter-gson:2.5.0' + implementation 'com.github.bumptech.glide:glide:4.9.0' + annotationProcessor "androidx.annotation:annotation:${rootProject.ext.supportLibraryVersion}" + annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' implementation project(':proteus-core') implementation project(':gson-adapter') diff --git a/demo/src/main/java/com/flipkart/android/proteus/demo/ProteusActivity.java b/demo/src/main/java/com/flipkart/android/proteus/demo/ProteusActivity.java index 165bbc12..b126767a 100644 --- a/demo/src/main/java/com/flipkart/android/proteus/demo/ProteusActivity.java +++ b/demo/src/main/java/com/flipkart/android/proteus/demo/ProteusActivity.java @@ -20,10 +20,10 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -45,6 +45,7 @@ import com.flipkart.android.proteus.value.Layout; import com.flipkart.android.proteus.value.ObjectValue; import com.flipkart.android.proteus.value.Value; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import java.util.Map; diff --git a/demo/src/main/res/layout/activity_proteus.xml b/demo/src/main/res/layout/activity_proteus.xml index 4999677e..7ea28acf 100644 --- a/demo/src/main/res/layout/activity_proteus.xml +++ b/demo/src/main/res/layout/activity_proteus.xml @@ -14,29 +14,29 @@ ~ limitations under the License. --> - - - - + - - + diff --git a/design/build.gradle b/design/build.gradle index 04d41e6d..8e2e0540 100644 --- a/design/build.gradle +++ b/design/build.gradle @@ -47,7 +47,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.google.android.material:material:${rootProject.ext.supportLibraryVersion}" + implementation "com.google.android.material:material:1.0.0" api "androidx.appcompat:appcompat:${rootProject.ext.supportLibraryVersion}" api project(path: ':proteus-core') diff --git a/gradle.properties b/gradle.properties index ca09a229..9af92538 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,3 +46,6 @@ org.gradle.parallel=true # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand org.gradle.configureondemand=true +android.enableJetifier=true +android.useAndroidX=true + diff --git a/recyclerview-v7/build.gradle b/recyclerview-v7/build.gradle index bbae8c5d..64c6c5f5 100644 --- a/recyclerview-v7/build.gradle +++ b/recyclerview-v7/build.gradle @@ -47,7 +47,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "androidx.recyclerview:recyclerview:${rootProject.ext.supportLibraryVersion}" + implementation "androidx.recyclerview:recyclerview:1.0.0" api "androidx.appcompat:appcompat:${rootProject.ext.supportLibraryVersion}" api project(path: ':proteus-core')