Skip to content

Commit 1f7754d

Browse files
committed
bump up deps
1 parent fa00879 commit 1f7754d

File tree

5 files changed

+23
-35
lines changed

5 files changed

+23
-35
lines changed

bottom-navigation-bar/build.gradle

+4-10
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ android {
3030
}
3131

3232
compileSdkVersion Integer.parseInt(ANDROID_COMPILE_SDK_VERSION)
33-
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
3433

3534
defaultConfig {
3635
minSdkVersion Integer.parseInt(ANDROID_MIN_SDK_VERSION)
37-
targetSdkVersion Integer.parseInt(ANDROID_BUILD_TARGET_SDK_VERSION)
3836
versionCode Integer.parseInt(APP_VERSION_CODE)
3937
versionName project.APP_VERSION_NAME
4038
}
@@ -45,19 +43,15 @@ android {
4543
}
4644
}
4745
compileOptions {
48-
sourceCompatibility JavaVersion.VERSION_1_7
49-
targetCompatibility JavaVersion.VERSION_1_7
46+
sourceCompatibility JavaVersion.VERSION_1_8
47+
targetCompatibility JavaVersion.VERSION_1_8
5048
}
5149
}
5250

53-
ext {
54-
supportLibraryVersion = project.ANDROID_SUPPORT_LIBRARY_VERSION
55-
}
56-
5751
dependencies {
5852
testImplementation 'junit:junit:4.12'
59-
implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
60-
implementation "com.android.support:design:${supportLibraryVersion}"
53+
implementation 'androidx.appcompat:appcompat:1.1.0'
54+
implementation 'com.google.android.material:material:1.2.0-alpha05'
6155
}
6256

6357
// Place it at the end of the file

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.71'
4+
ext.kotlin_version = '1.3.61'
55
repositories {
66
jcenter()
77
google()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.2.1'
11-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
12-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
10+
classpath 'com.android.tools.build:gradle:3.6.1'
11+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
12+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414

1515
// NOTE: Do not place your application dependencies here; they belong

gradle.properties

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ org.gradle.jvmargs=-Xmx3072m
2020

2121

2222
# Change Travis when these is changed.
23-
ANDROID_COMPILE_SDK_VERSION=28
24-
ANDROID_BUILD_TOOLS_VERSION=28.0.3
25-
ANDROID_BUILD_TARGET_SDK_VERSION=28
23+
ANDROID_COMPILE_SDK_VERSION=29
2624
ANDROID_MIN_SDK_VERSION=14
2725
APP_VERSION_NAME=2.1.0
2826
APP_VERSION_CODE=20
29-
ANDROID_SUPPORT_LIBRARY_VERSION=28.0.0
27+
android.useAndroidX=true
28+
android.enableJetifier=true
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Oct 27 07:04:28 IST 2018
1+
#Sat Feb 29 21:31:16 IST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

sample/build.gradle

+10-15
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ android {
77
}
88

99
compileSdkVersion Integer.parseInt(ANDROID_COMPILE_SDK_VERSION)
10-
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
1110

1211
dexOptions {
1312
maxProcessCount 2
@@ -17,11 +16,11 @@ android {
1716
defaultConfig {
1817
applicationId "com.ashokvarma.bottomnavigation.sample"
1918
minSdkVersion Integer.parseInt(ANDROID_MIN_SDK_VERSION)
20-
targetSdkVersion Integer.parseInt(ANDROID_BUILD_TARGET_SDK_VERSION)
19+
targetSdkVersion 29
2120
versionCode Integer.parseInt(APP_VERSION_CODE)
2221
versionName project.APP_VERSION_NAME
2322

24-
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
23+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2524
}
2625
buildTypes {
2726
release {
@@ -34,34 +33,30 @@ android {
3433
}
3534
}
3635
compileOptions {
37-
sourceCompatibility JavaVersion.VERSION_1_7
38-
targetCompatibility JavaVersion.VERSION_1_7
36+
sourceCompatibility JavaVersion.VERSION_1_8
37+
targetCompatibility JavaVersion.VERSION_1_8
3938
}
4039
}
4140

4241
repositories {
4342
mavenCentral()
4443
}
4544

46-
ext {
47-
supportLibraryVersion = project.ANDROID_SUPPORT_LIBRARY_VERSION
48-
}
49-
5045
dependencies {
5146
testImplementation 'junit:junit:4.12'
52-
implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
53-
implementation "com.android.support:design:${supportLibraryVersion}"
47+
implementation 'androidx.appcompat:appcompat:1.1.0'
48+
implementation 'com.google.android.material:material:1.2.0-alpha05'
5449
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5550
implementation project(':bottom-navigation-bar')
5651

5752
// Testing-only dependencies
5853
// Android testing support library's runner and rules
59-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
60-
androidTestImplementation 'com.android.support.test:rules:1.0.2'
54+
androidTestImplementation 'androidx.test:runner:1.2.0'
55+
androidTestImplementation 'androidx.test:rules:1.2.0'
6156
// Force usage of support annotations in the test app, since it is internally used by the runner module.
6257
// to avoid Conflict with dependency 'com.android.support:support-annotations'. Resolved versions for app (23.4.0) and test app (23.1.1) differ.
63-
androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
58+
androidTestImplementation 'androidx.annotation:annotation:1.1.0'
6459

6560
// Espresso Ui Testing dependencies
66-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
61+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
6762
}

0 commit comments

Comments
 (0)