Skip to content

Commit

Permalink
fix other runtime errors
Browse files Browse the repository at this point in the history
  • Loading branch information
adityasharat committed Mar 14, 2019
1 parent d724939 commit e091f8f
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ ext {
minSdkVersion = 19
targetSdkVersion = 28
buildToolsVersion = '28.0.3'
supportLibraryVersion = '1.0.0'
supportLibraryVersion = '1.0.2'
}
2 changes: 1 addition & 1 deletion cardview-v7/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
15 changes: 6 additions & 9 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
12 changes: 6 additions & 6 deletions demo/src/main/res/layout/activity_proteus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,34 @@
~ limitations under the License.
-->

<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">

<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />

</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>

<include layout="@layout/content_main" />

<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
app:srcCompat="@android:drawable/ic_dialog_info" />

</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
2 changes: 1 addition & 1 deletion design/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion recyclerview-v7/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down

0 comments on commit e091f8f

Please sign in to comment.