From 17699e07c2bf8bbe12312e49249333e57d4d1339 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 9 Aug 2021 09:54:34 +0200
Subject: [PATCH] Migrate to Android Plugin 7.0
---
build.gradle | 8 +++++---
gradle/wrapper/gradle-wrapper.properties | 4 ++--
mailbox-android/build.gradle | 2 +-
mailbox-cli/build.gradle | 15 ++++-----------
mailbox-core/build.gradle | 9 ++++-----
5 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/build.gradle b/build.gradle
index 36a5303e..dd593196 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,14 @@
buildscript {
- ext.kotlin_version = "1.5.21"
- ext.hilt_version = "2.37"
+ ext.kotlin_version = '1.5.21'
+ ext.hilt_version = '2.37'
+ ext.junit_version = '5.7.2'
+ ext.mockk_version = '1.10.4'
repositories {
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
+ classpath 'com.android.tools.build:gradle:7.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8cd9e2f5..d2a906e4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
-distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionSha256Sum=13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d
diff --git a/mailbox-android/build.gradle b/mailbox-android/build.gradle
index a90a9f1c..983da37d 100644
--- a/mailbox-android/build.gradle
+++ b/mailbox-android/build.gradle
@@ -47,7 +47,7 @@ dependencies {
implementation project(path: ':mailbox-core', configuration: 'default')
implementation 'androidx.appcompat:appcompat:1.3.1'
- implementation "androidx.activity:activity-ktx:1.3.0"
+ implementation "androidx.activity:activity-ktx:1.3.1"
implementation "androidx.fragment:fragment-ktx:1.3.6"
def lifecycle_version = "2.3.1"
diff --git a/mailbox-cli/build.gradle b/mailbox-cli/build.gradle
index fac4db80..6cd010cc 100644
--- a/mailbox-cli/build.gradle
+++ b/mailbox-cli/build.gradle
@@ -1,9 +1,3 @@
-import java.util.jar.JarEntry
-import java.util.jar.JarFile
-import java.util.jar.JarOutputStream
-
-import static java.util.Collections.list
-
plugins {
id 'application'
id 'idea'
@@ -20,11 +14,10 @@ dependencies {
implementation 'org.slf4j:slf4j-simple:1.7.30'
implementation 'com.github.ajalt:clikt:2.2.0'
- def junitVersion = '5.5.2'
- testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
- testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
- testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
- testImplementation 'io.mockk:mockk:1.10.4'
+ testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+ testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
+ testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+ testImplementation "io.mockk:mockk:$mockk_version"
}
application {
diff --git a/mailbox-core/build.gradle b/mailbox-core/build.gradle
index c9959b80..b6229d20 100644
--- a/mailbox-core/build.gradle
+++ b/mailbox-core/build.gradle
@@ -11,11 +11,10 @@ targetCompatibility = 1.8
dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- def junitVersion = '5.5.2'
- testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
- testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
- testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
- testImplementation 'io.mockk:mockk:1.10.4'
+ testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+ testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
+ testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+ testImplementation "io.mockk:mockk:$mockk_version"
}
test {
--
GitLab