Skip to content

Commit

Permalink
Bump up material design version to 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
TonyTangAndroid committed Aug 19, 2021
1 parent 7891964 commit 8b5fd81
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
22 changes: 13 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ buildscript {

repositories {
google()
mavenCentral()
//noinspection JcenterRepositoryObsolete
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.1'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -19,6 +21,8 @@ buildscript {
allprojects {
repositories {
google()
mavenCentral()
//noinspection JcenterRepositoryObsolete
jcenter()
maven { url 'https://jitpack.io' }
}
Expand All @@ -30,21 +34,21 @@ task clean(type: Delete) {

ext {
minSdkVersion = 16
targetSdkVersion = 29
compileSdkVersion = 29
targetSdkVersion = 30
compileSdkVersion = 30

versionCode = 19
versionName = "2.0.0"
appcompatVersioon = '1.2.0'
materialVersioon = '1.2.1'
appcompatVersioon = '1.3.1'
materialVersioon = '1.3.0'
lifecycleVersion = '2.2.0'
pagingVersion = '2.1.2'
roomVersion = '2.2.6'
abpVersion = '1.1.1'
roomVersion = '2.3.0'
timberVersion = '4.7.1'
injectVersion = '1'

//test
truthVersion = '1.0.1'
truthVersion = '1.1.3'
junit = '4.13.2'

}
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ dependencies {
implementation "com.jakewharton.timber:timber:$timberVersion"
implementation "androidx.appcompat:appcompat:$appcompatVersioon"

testImplementation 'junit:junit:4.13.1'
testImplementation "junit:junit:$junit"
testImplementation "com.google.truth:truth:$truthVersion"
}
4 changes: 3 additions & 1 deletion wood/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,18 @@ dependencies {

api "javax.inject:javax.inject:$injectVersion"
api "com.jakewharton.timber:timber:$timberVersion"
//noinspection GradleDependency
api "com.google.android.material:material:$materialVersioon"
api "androidx.appcompat:appcompat:$appcompatVersioon"
api "androidx.room:room-runtime:$roomVersion"
//noinspection GradleDependency
api "androidx.paging:paging-runtime:$pagingVersion"
api "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"


annotationProcessor "androidx.room:room-compiler:$roomVersion"

testImplementation 'junit:junit:4.13.1'
testImplementation "junit:junit:$junit"
testImplementation "com.google.truth:truth:$truthVersion"
}

Expand Down

0 comments on commit 8b5fd81

Please sign in to comment.