Skip to content

Commit

Permalink
Upgrade gradle (#184)
Browse files Browse the repository at this point in the history
* upgrade gradle and AGP

* update fat-aar plugin
  • Loading branch information
ekoby authored May 17, 2021
1 parent 881ac79 commit d8ed28c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
google()
}
dependencies {
classpath("com.android.tools.build:gradle:4.1.3")
classpath("com.android.tools.build:gradle:4.2.1")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.32")
}

Expand Down Expand Up @@ -96,7 +96,6 @@ subprojects {

repositories {
mavenCentral()
jcenter()
}

tasks.withType(PublishToMavenRepository).all {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2018-2020 NetFoundry, Inc.
# Copyright (c) 2018-2021 NetFoundry, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
7 changes: 5 additions & 2 deletions ziti-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@
* limitations under the License.
*/
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.kezong:fat-aar:1.3.4'
classpath 'com.github.kezong:fat-aar:1.3.6'
}
}

Expand Down Expand Up @@ -84,7 +87,7 @@ dependencies {
implementation deps.kotlin
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"

testApi deps.jupiterApi
testImplementation deps.jupiterApi
testImplementation deps.jupiter
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
Expand Down

0 comments on commit d8ed28c

Please sign in to comment.