Skip to content

Commit

Permalink
upgrade(dependencies): sdk 30
Browse files Browse the repository at this point in the history
  • Loading branch information
sjwall committed Jul 2, 2021
1 parent 099d751 commit 9a2eac1
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 21 deletions.
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2019 Samuel Wall
* Copyright (C) 2016-2021 Samuel Wall
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,16 +15,17 @@
*/

buildscript {
ext.kotlin_version = '1.4.31'
ext.kotlin_version = '1.5.10'
repositories {
mavenCentral()
google()
maven {
url "https://plugins.gradle.org/m2/"
}
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'org.jacoco:org.jacoco.core:0.8.6'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand All @@ -34,16 +35,16 @@ buildscript {

allprojects {
repositories {
mavenCentral()
google()
jcenter()
}
}

ext {
minSdkVersion = 14
targetSdkVersion = 29
compileSdkVersion = 29
buildToolsVersion = '29.0.2'
targetSdkVersion = 30
compileSdkVersion = 30
buildToolsVersion = '30.0.3'

versionCode = 63
versionName = '3.2.0'
Expand Down
18 changes: 17 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
#
# Copyright (C) 2016-2021 Samuel Wall
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

#Sun Oct 18 21:56:15 BST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
13 changes: 7 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,20 @@ configurations {
dependencies {
implementation 'androidx.annotation:annotation:[1.1.0,)'

testImplementation 'androidx.test:core:1.3.0'
testImplementation 'androidx.test:core:1.4.0'

implementation 'androidx.lifecycle:lifecycle-extensions:[2.2.0,)'

compileOnly 'androidx.fragment:fragment:[1.1.0,)'

testImplementation 'androidx.test.ext:junit:1.1.2'
testImplementation 'androidx.test.ext:junit:1.1.3'

testImplementation 'androidx.fragment:fragment-testing:1.3.3'
testImplementation 'androidx.fragment:fragment-testing:1.3.5'

testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:4.5.1'
testImplementation 'org.mockito:mockito-core:3.0.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
testImplementation 'org.junit.vintage:junit-vintage-engine:5.7.2'
testImplementation 'org.robolectric:robolectric:4.6'
testImplementation 'org.mockito:mockito-core:3.11.2'

javadocCompile 'androidx.annotation:annotation:1.1.0'
javadocCompile 'androidx.fragment:fragment:1.2.5'
Expand Down
15 changes: 8 additions & 7 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,15 @@ dependencies {
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'

testImplementation 'junit:junit:4.12'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
testImplementation 'org.junit.vintage:junit-vintage-engine:5.7.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

androidTestImplementation 'androidx.annotation:annotation:1.1.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.annotation:annotation:1.2.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test:rules:1.4.0'

androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.4.0'
}

0 comments on commit 9a2eac1

Please sign in to comment.