Skip to content
This repository was archived by the owner on Jan 2, 2021. It is now read-only.

Commit 846b54d

Browse files
committed
1. Update support library to 28.0.0
2. Update gradle scripts 3. Update DataBinding library to v2
1 parent ffe1347 commit 846b54d

6 files changed

Lines changed: 18 additions & 15 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
google()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.0.0'
7+
classpath 'com.android.tools.build:gradle:3.1.4'
88
classpath 'com.novoda:bintray-release:0.7.0'
99
}
1010
}

buildSrc/src/main/java/gradle/Config.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818

1919
public class Config {
2020

21-
public static final int MIN_SDK = 9;
22-
public static final int COMPILE_SDK = 25;
21+
public static final int MIN_SDK = 14;
22+
public static final int COMPILE_SDK = 28;
2323
public static final int TARGET_SDK = COMPILE_SDK;
2424

25-
public static final String VERSION_NAME = "1.2.6";
26-
public static final int VERSION_CODE = 126;
25+
public static final String VERSION_NAME = "1.3.0";
26+
public static final int VERSION_CODE = 130;
2727

28-
private static final String SUPPORT_LIB_VERSION = "25.4.0";
28+
private static final String SUPPORT_LIB_VERSION = "28.0.0";
2929
private static final String SUPPORT = "com.android.support:";
3030

3131
public static final String APP_COMPAT = SUPPORT + "appcompat-v7:" + SUPPORT_LIB_VERSION;

gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
1515
# This option should only be used with decoupled projects. More details, visit
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1717

18-
org.gradle.parallel=true
18+
org.gradle.parallel=true
19+
20+
21+
android.databinding.enableV2=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

multi-view-adapter-databinding/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ dependencies {
4242
implementation project(':multi-view-adapter')
4343
implementation Config.RECYCLER_VIEW
4444

45-
compileOnly('com.android.databinding:library:1.3.1') {
45+
compileOnly('com.android.databinding:library:3.2.0') {
4646
transitive = false
4747
}
48-
compileOnly('com.android.databinding:baseLibrary:2.3.2') {
48+
compileOnly('com.android.databinding:baseLibrary:3.2.0') {
4949
transitive = false
5050
}
5151
}

sample/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ android {
4343
}
4444

4545
dependencies {
46-
compile project(':multi-view-adapter')
47-
compile project(':multi-view-adapter-databinding')
46+
implementation project(':multi-view-adapter')
47+
implementation project(':multi-view-adapter-databinding')
4848

4949
implementation Config.APP_COMPAT
5050
implementation Config.RECYCLER_VIEW
5151
implementation Config.CARD_VIEW
5252
implementation Config.DESIGN
53-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
53+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
5454

55-
debugCompile "com.github.brianPlummer:tinydancer:0.1.0"
56-
releaseCompile "com.github.brianPlummer:tinydancer-noop:0.1.0"
55+
debugImplementation "com.github.brianPlummer:tinydancer:0.1.0"
56+
releaseImplementation "com.github.brianPlummer:tinydancer-noop:0.1.0"
5757
}

0 commit comments

Comments
 (0)