From 22fbe4a51b0658064e76a84a599c06c16f93c3a9 Mon Sep 17 00:00:00 2001
From: Evgenii Kozlov <ubuphobos@gmail.com>
Date: Thu, 27 May 2021 13:00:26 +0300
Subject: [PATCH] Tech | Android Gradle plugin 4.2.1 (#1495)

---
 build.gradle             | 16 +++++++++++++++-
 gradle.properties        |  1 -
 middleware.sh            |  4 ++--
 middleware/build.gradle  |  8 ++------
 persistence/build.gradle |  2 ++
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index bbea338c3d..765f8275d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
         classpath 'com.google.gms:google-services:4.3.4'
@@ -45,6 +45,20 @@ allprojects {
     }
 }
 
+subprojects {
+    repositories {
+        maven {
+            url "${rootProject.projectDir}/libs"
+            metadataSources {
+                artifact()
+            }
+            content {
+                includeModule("io.anytype", "middleware-library")
+            }
+        }
+    }
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle.properties b/gradle.properties
index ce1e07a6e0..f456a41ce7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,6 @@ org.gradle.jvmargs=-Xmx2048M
 org.gradle.configureondemand=true
 
 android.enableR8=true
-android.enableUnitTestBinaryResources=true
 android.useAndroidX=true
 android.enableJetifier=false
 
diff --git a/middleware.sh b/middleware.sh
index ee07ed21bc..67a148b5c0 100755
--- a/middleware.sh
+++ b/middleware.sh
@@ -39,8 +39,8 @@ printf "Done\n"
 
 printf "Preparing files\n"
 
-mkdir -p libs/
-mv /tmp/lib/lib.aar libs/
+mkdir -p libs/io/anytype/middleware-library/1.0.0/
+mv /tmp/lib/lib.aar libs/io/anytype/middleware-library/1.0.0/middleware-library-1.0.0.aar
 
 rm -rf /tmp/lib
 rm -rf $FILE
diff --git a/middleware/build.gradle b/middleware/build.gradle
index 392f325906..7b60b5c2bb 100644
--- a/middleware/build.gradle
+++ b/middleware/build.gradle
@@ -26,15 +26,11 @@ android {
 dependencies {
 
     implementation project(':core-models')
-
-    def props = new Properties()
-    project.rootProject.file('configuration.properties').withDataInputStream { props.load(it) }
-    def libraryPath = project.rootProject.file(props.getProperty('middleware.path'))
-    implementation(files(libraryPath))
-
     implementation project(':protocol')
     implementation project(':data')
 
+    implementation "io.anytype:middleware-library:1.0.0@aar"
+
     def applicationDependencies = rootProject.ext.mainApplication
     def unitTestDependencies = rootProject.ext.unitTesting
 
diff --git a/persistence/build.gradle b/persistence/build.gradle
index e276113e2d..3699107fa8 100644
--- a/persistence/build.gradle
+++ b/persistence/build.gradle
@@ -38,6 +38,8 @@ dependencies {
     implementation databaseDependencies.roomKtx
 
     kapt databaseDependencies.annotations
+    // Current workaround for ROOM on MAC M1 issue.
+    kapt("org.xerial:sqlite-jdbc:3.34.0")
 
     implementation applicationDependencies.timber