From 593e4b283778747c05ba18b9b1c3fc7158552611 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 May 2022 14:46:34 +0200 Subject: [PATCH] adding a commented out way of including Commons locally --- app/build.gradle | 4 +++- build.gradle | 10 ++++++++++ settings.gradle | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d8524e197..e397eaf29 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,7 +78,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:795a4ae3e3' + implementation 'com.github.SimpleMobileTools:Simple-Commons:5add391a37' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24' @@ -105,6 +105,8 @@ dependencies { kapt 'androidx.room:room-compiler:2.3.0' implementation 'androidx.room:room-runtime:2.3.0' annotationProcessor 'androidx.room:room-compiler:2.3.0' + + //implementation project(':commons') } // Apply the PESDKPlugin diff --git a/build.gradle b/build.gradle index 2857455bf..c59d4b18b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + // needed only if we are including commons locally from our pc, not via Jitpack + /*ext { + propCompileSdkVersion = 31 + propMinSdkVersion = 21 + propTargetSdkVersion = propCompileSdkVersion + propVersionCode = 1 + propVersionName = '5.34.26' + kotlin_version = '1.6.21' + }*/ + ext.kotlin_version = '1.6.21' ext.is_proprietary = gradle.startParameter.taskNames.any { task -> task.contains("Proprietary") } diff --git a/settings.gradle b/settings.gradle index e7b4def49..d100c1c8e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ include ':app' +//include ':commons' +//project(':commons').projectDir = new File('../Simple-Commons/commons')