-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade AGP, Gradle, language dependencies
- Upgrades - Gradle distribution 7.5 - Gradle 7.3.1 - Java 1.8 - Kotlin 1.6.2 - jacoco 0.8.8 - Expand .gitignore - Restructure plugin declarations - Fix functional test configuration (dex, androidx.test:core))
- Loading branch information
1 parent
7338285
commit 5701a42
Showing
6 changed files
with
88 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,43 @@ | ||
| // Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
| buildscript { | ||
| ext { | ||
| kotlin_version = '1.5.0' | ||
| } | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| maven { url "https://plugins.gradle.org/m2/" } | ||
| maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:4.0.1' | ||
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||
| classpath "com.diffplug.spotless:spotless-plugin-gradle:5.12.5" | ||
| // NOTE: Do not place your application dependencies here; they belong | ||
| // in the individual module build.gradle files | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| maven { url "https://plugins.gradle.org/m2/" } | ||
| maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } | ||
| } | ||
|
|
||
| apply plugin: 'maven-publish' | ||
| } | ||
|
|
||
| task clean(type: Delete) { | ||
| delete rootProject.buildDir | ||
| plugins { | ||
| id 'com.android.application' version '7.3.1' apply false | ||
| id 'com.android.library' version '7.3.1' apply false | ||
| id 'com.diffplug.gradle.spotless' version '6.11.0' apply false | ||
| id 'org.jetbrains.kotlin.android' version "1.6.21" apply false | ||
| } | ||
|
|
||
| ext { | ||
| // android config | ||
| minSdkVersion = 19 | ||
| targetSdkVersion = 29 | ||
| compileSdkVersion = 29 | ||
| targetSdkVersion = 33 | ||
| compileSdkVersion = 33 | ||
| versionCode = 1 | ||
|
|
||
| // java config | ||
| sourceCompatibility = JavaVersion.VERSION_1_7 | ||
| targetCompatibility = JavaVersion.VERSION_1_7 | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
|
|
||
| // dependencies | ||
| // kotlin config | ||
| kotlinVersion = "1.6.21" | ||
| kotlinJvmTarget = "1.8" | ||
|
|
||
| // test dependencies | ||
| junitVersion = "1.1.2" | ||
| mockitoCoreVersion = "2.28.2" | ||
| buildToolsVersion = "29.0.3" | ||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| jacocoVersion = "0.8.5" | ||
|
|
||
| // build tools | ||
| buildToolsVersion = "29.0.3" | ||
|
|
||
| // spotless | ||
| prettierVersion = "2.7.1" | ||
| prettierPluginJavaVersion = "1.6.2" | ||
|
|
||
| // jacoco | ||
| jacocoVersion = "0.8.8" | ||
| } | ||
|
|
||
| task clean(type: Delete) { | ||
| delete rootProject.buildDir | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Fri Mar 18 11:50:52 PDT 2022 | ||
| #Mon Nov 07 08:48:57 PST 2022 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip | ||
| distributionPath=wrapper/dists | ||
| zipStorePath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,20 @@ | ||
| pluginManagement { | ||
| repositories { | ||
| gradlePluginPortal() | ||
| google() | ||
| mavenCentral() | ||
| } | ||
| } | ||
|
|
||
| dependencyResolutionManagement { | ||
| repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } | ||
| } | ||
| } | ||
|
|
||
| include ':app' | ||
| include ':edgeidentity' | ||
| rootProject.name = "edgeidentity-sdk" |