From 52ebe74302b15b50fdc56f079287160964b3152f Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 21 Jul 2022 17:04:31 +0200 Subject: [PATCH] Realm : add realm-kotlin dependencies --- dependencies.gradle | 4 +++- dependencies_groups.gradle | 1 + gradle.properties | 3 +++ matrix-sdk-android/build.gradle | 27 ++++++++++++++++----------- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 87031dec37..412fade3c2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -28,7 +28,6 @@ def glide = "4.13.2" def bigImageViewer = "1.8.1" def jjwt = "0.11.5" def vanniktechEmoji = "0.15.0" - def fragment = "1.5.0" // Testing @@ -161,6 +160,9 @@ ext.libs = [ apache : [ 'commonsImaging' : "org.apache.sanselan:sanselan:0.97-incubator" ], + realm : [ + 'base' : "io.realm.kotlin:library-base:${realmKotlinVersion}" + ], tests : [ 'kluent' : "org.amshove.kluent:kluent-android:1.68", 'timberJunitRule' : "net.lachlanmckee:timber-junit-rule:1.0.1", diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index e89c69a594..f3f35cc88c 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -138,6 +138,7 @@ ext.groups = [ 'io.opencensus', 'io.reactivex.rxjava2', 'io.realm', + 'io.realm.kotlin', 'it.unimi.dsi', 'jakarta.activation', 'jakarta.xml.bind', diff --git a/gradle.properties b/gradle.properties index 6de52be607..ba639a9a52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,3 +32,6 @@ signing.element.storePath=pathTo.keystore signing.element.storePassword=Secret signing.element.keyId=Secret signing.element.keyPassword=Secret + +# This belongs here as it's the only way to share the version number between the plugin and the library. +realmKotlinVersion = 1.0.1 diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 6f1646ec53..63a74344d1 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -1,14 +1,3 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-parcelize' -apply plugin: 'realm-android' -apply plugin: "org.jetbrains.dokka" - -if (project.hasProperty("coverage")) { - apply plugin: 'jacoco' -} - buildscript { repositories { // Do not use `mavenCentral()`, it prevents Dependabot from working properly @@ -21,6 +10,21 @@ buildscript { } } +plugins { + id("io.realm.kotlin") version "${realmKotlinVersion}" +} + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' +apply plugin: 'kotlin-parcelize' +apply plugin: 'realm-android' +apply plugin: "org.jetbrains.dokka" + +if (project.hasProperty("coverage")) { + apply plugin: 'jacoco' +} + dokkaHtml { dokkaSourceSets { configureEach { @@ -172,6 +176,7 @@ dependencies { // Database implementation 'com.github.Zhuinden:realm-monarchy:0.7.1' + implementation libs.realm.base kapt 'dk.ilios:realmfieldnameshelper:2.0.0'