From fe7a8fac11e3ab0d7739eee208d4a07d4b797dfc Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Sun, 6 Jun 2021 02:26:55 +0200
Subject: [PATCH] Update build tools

---
 CuckooChessApp/build.gradle              | 10 ++++++++--
 DroidFishApp/build.gradle                | 11 ++++++++++-
 build.gradle                             |  6 ++----
 gradle/wrapper/gradle-wrapper.properties |  6 +++---
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/CuckooChessApp/build.gradle b/CuckooChessApp/build.gradle
index ead4446..f7b78af 100644
--- a/CuckooChessApp/build.gradle
+++ b/CuckooChessApp/build.gradle
@@ -3,8 +3,6 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 28
 
-    dataBinding.enabled = true
-
     defaultConfig {
         applicationId "org.petero.cuckoochess"
         minSdkVersion 14
@@ -35,10 +33,18 @@ android {
             }
         }
     }
+
+    lintOptions {
+        abortOnError false
+    }
     compileOptions {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
     }
+
+    buildFeatures {
+        dataBinding true
+    }
 }
 
 dependencies {
diff --git a/DroidFishApp/build.gradle b/DroidFishApp/build.gradle
index ba331c0..3be0a1a 100644
--- a/DroidFishApp/build.gradle
+++ b/DroidFishApp/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
+
     defaultConfig {
         applicationId "org.petero.droidfish"
         minSdkVersion 16
@@ -51,7 +52,9 @@ android {
         targetCompatibility = '1.8'
     }
 
-    dataBinding.enabled = true
+    buildFeatures {
+        dataBinding true
+    }
 }
 
 dependencies {
@@ -85,3 +88,9 @@ task copyToAssets(type: Copy, dependsOn: 'externalNativeBuildRelease') {
 tasks.withType(JavaCompile) {
     t -> t.dependsOn copyToAssets
 }
+android {
+  applicationVariants.all { variant ->
+    tasks["merge${variant.name.capitalize()}Assets"]
+      .dependsOn(copyToAssets)
+  }
+}
diff --git a/build.gradle b/build.gradle
index df3eedd..dc28673 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,11 +3,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
-        
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,7 +16,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b37a2ad..90e197b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 08 22:53:49 CET 2019
+#Sun Jun 06 01:35:48 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+zipStoreBase=GRADLE_USER_HOME