From c6bff25d29b0a45db644587411e0410603c861ee Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Thu, 29 Jul 2021 18:09:15 +0200
Subject: [PATCH] bump gradle and gradle plugin as auto-applied by Android
 Studio Arctic Fox (2020.3.1)

Bump protobuf gradle plugin to fix build
Also bump other unrelated dependencies and fix some linting
---
 GBDaoGenerator/build.gradle              |  2 +-
 app/build.gradle                         | 14 +++++++++-----
 build.gradle                             |  4 ++--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/GBDaoGenerator/build.gradle b/GBDaoGenerator/build.gradle
index 64d00d2ef..609846799 100644
--- a/GBDaoGenerator/build.gradle
+++ b/GBDaoGenerator/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin:'application'
 
 archivesBaseName = 'gadgetbridge-daogenerator'
diff --git a/app/build.gradle b/app/build.gradle
index aa1a47f83..257990258 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,7 @@
+import com.github.spotbugs.SpotBugsTask
+
+import java.nio.file.Files
+
 apply plugin: "com.android.application"
 apply plugin: "com.github.spotbugs"
 apply plugin: "pmd"
@@ -8,7 +12,7 @@ def ABORT_ON_CHECK_FAILURE = false
 tasks.withType(Test) {
     systemProperty "MiFirmwareDir", System.getProperty("MiFirmwareDir", null)
     systemProperty "logback.configurationFile", System.getProperty("user.dir", null) + "/app/src/main/assets/logback.xml"
-    systemProperty "GB_LOGFILES_DIR", java.nio.file.Files.createTempDirectory("gblog").toString()
+    systemProperty "GB_LOGFILES_DIR", Files.createTempDirectory("gblog").toString()
 }
 
 android {
@@ -70,16 +74,16 @@ dependencies {
     testImplementation "com.google.code.gson:gson:2.8.6"
 
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "androidx.appcompat:appcompat:1.3.0"
+    implementation "androidx.appcompat:appcompat:1.3.1"
     implementation "androidx.preference:preference:1.1.1"
     implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.recyclerview:recyclerview:1.2.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.multidex:multidex:2.0.1"
     implementation "androidx.palette:palette:1.0.0"
 
-    implementation "com.google.android.material:material:1.3.0"
+    implementation "com.google.android.material:material:1.4.0"
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation "com.google.code.gson:gson:2.8.6"
 
@@ -167,7 +171,7 @@ spotbugs {
     reportLevel = "medium"
 }
 
-tasks.withType(com.github.spotbugs.SpotBugsTask) {
+tasks.withType(SpotBugsTask) {
     source = fileTree('src/main/java')
     classes = files("${project.rootDir}/app/build/intermediates/javac/debug/classes")
     excludeFilter = new File("${project.rootDir}/config/findbugs/findbugs-filter.xml")
diff --git a/build.gradle b/build.gradle
index cbeb757e1..2f7f37cda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,10 +9,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.0.0'
 
         classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:2.0.0'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 472f6bb69..7957c716d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip