Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c7e610f

Browse files
committedJun 7, 2019
Merge branch 'androidx' of https://github.com/privatez/Fragmentation into privatez-androidx
2 parents 31c97e1 + f4f5255 commit c7e610f

File tree

128 files changed

+323
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+323
-332
lines changed
 

‎build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.0.1'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
1010
// classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
1111
}
1212
}
@@ -23,10 +23,9 @@ task clean(type: Delete) {
2323
}
2424

2525
ext {
26-
compileSdkVersion = 27
27-
buildToolsVersion = "27.0.2"
26+
compileSdkVersion = 28
2827
minSdkVersion = 14
2928
targetSdkVersion = compileSdkVersion
3029

31-
v4Version = "27.1.1"
30+
appCompatVersion = "1.1.0-alpha01"
3231
}

‎demo/build.gradle

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ static def gitLatestTag() {
1212

1313
android {
1414
compileSdkVersion rootProject.compileSdkVersion
15-
buildToolsVersion rootProject.buildToolsVersion
1615

1716
defaultConfig {
1817
applicationId "me.yokeyword.sample"
@@ -52,17 +51,17 @@ android {
5251
}
5352

5453
dependencies {
55-
compile fileTree(include: ['*.jar'], dir: 'libs')
56-
testCompile 'junit:junit:4.12'
57-
compile "com.android.support:appcompat-v7:$rootProject.v4Version"
58-
compile "com.android.support:design:$rootProject.v4Version"
59-
compile "com.android.support:cardview-v7:$rootProject.v4Version"
60-
compile "com.android.support:recyclerview-v7:$rootProject.v4Version"
61-
compile project(':fragmentation')
62-
compile project(':fragmentation_swipeback')
54+
implementation fileTree(include: ['*.jar'], dir: 'libs')
55+
testImplementation 'junit:junit:4.12'
56+
api "androidx.appcompat:appcompat:$rootProject.appCompatVersion"
57+
implementation 'com.google.android.material:material:1.1.0-alpha02'
58+
implementation 'androidx.cardview:cardview:1.0.0'
59+
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01'
60+
api project(':fragmentation')
61+
api project(':fragmentation_swipeback')
6362
// EventBus
64-
compile project(':eventbus_activity_scope')
65-
compile 'org.greenrobot:eventbus:3.0.0'
63+
api project(':eventbus_activity_scope')
64+
implementation 'org.greenrobot:eventbus:3.0.0'
6665
// apt 'org.greenrobot:eventbus-annotation-processor:3.0.1'
6766
}
6867

0 commit comments

Comments
 (0)
Please sign in to comment.