Skip to content

Commit d8ed28c

Browse files
authored
Upgrade gradle (#184)
* upgrade gradle and AGP * update fat-aar plugin
1 parent 881ac79 commit d8ed28c

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ buildscript {
2020
google()
2121
}
2222
dependencies {
23-
classpath("com.android.tools.build:gradle:4.1.3")
23+
classpath("com.android.tools.build:gradle:4.2.1")
2424
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.32")
2525
}
2626

@@ -96,7 +96,6 @@ subprojects {
9696

9797
repositories {
9898
mavenCentral()
99-
jcenter()
10099
}
101100

102101
tasks.withType(PublishToMavenRepository).all {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018-2020 NetFoundry, Inc.
2+
# Copyright (c) 2018-2021 NetFoundry, Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip

ziti-android/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
* limitations under the License.
1515
*/
1616
buildscript {
17+
repositories {
18+
mavenCentral()
19+
}
1720
dependencies {
18-
classpath 'com.kezong:fat-aar:1.3.4'
21+
classpath 'com.github.kezong:fat-aar:1.3.6'
1922
}
2023
}
2124

@@ -84,7 +87,7 @@ dependencies {
8487
implementation deps.kotlin
8588
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
8689

87-
testApi deps.jupiterApi
90+
testImplementation deps.jupiterApi
8891
testImplementation deps.jupiter
8992
androidTestImplementation 'com.android.support.test:runner:1.0.2'
9093
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

0 commit comments

Comments
 (0)