Skip to content

Instantly share code, notes, and snippets.

@yaakovgamliel
Created November 18, 2019 15:10
Show Gist options
  • Save yaakovgamliel/850c53bec201097d0eb57b05b403b9ae to your computer and use it in GitHub Desktop.
Save yaakovgamliel/850c53bec201097d0eb57b05b403b9ae to your computer and use it in GitHub Desktop.
commit f4fef1f9a2ef48d7f35f4ce74a55f35610193293
Author: Yaakov Gamliel <yaakov@sunbit.com>
Date: Mon Nov 18 17:08:25 2019 +0200
TMP changes to gradle setup
diff --git a/app/build.gradle b/app/build.gradle
index b78df3d..343d758 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -110,7 +110,7 @@ android {
applicationVariants.all { variant ->
variant.outputs.each { output ->
def file = new File(
- output.outputFile.parent,
+// output.outputFile.parent,
"mySunbit-android-${variant.buildType.name}.apk"
)
output.outputFileName = file
@@ -161,7 +161,8 @@ dependencies {
}
compile(libs.material_drawer) {
transitive = true
- exclude module: 'support-v4'
+ exclude module: 'support-v13'
+ exclude module: 'design'
}
compile(libs.roboguice) { exclude(group: 'javax.inject', module: 'javax.inject') }
compile(libs.dagger) { exclude(group: 'javax.inject', module: 'javax.inject') }
@@ -169,10 +170,14 @@ dependencies {
compile libs.badges
compile(libs.material_dialogs) {
transitive = true
- exclude module: 'support-v4'
+ exclude module: 'support-v13'
exclude module: 'recyclerview-v7'
}
- compile(libs.material_tab_strip) { exclude module: 'support-v4' }
+ compile(libs.material_tab_strip) {
+ transitive = true
+ exclude module: 'support-v13'
+ exclude module: 'design'
+ }
compile libs.recyclerview_multiselect
compile libs.recyclerview_fastscroll
compile libs.rx_java
@@ -180,7 +185,11 @@ dependencies {
compile libs.java_annotations
compile libs.rx_network
compile(libs.support.crashlytics) { transitive = true }
- compile libs.card_form
+ compile (libs.card_form) {
+ transitive = true
+ exclude module: 'support-v13'
+ exclude module: 'design'
+ }
compile libs.rx_binding
compile libs.rx_binding_appcompat
compile libs.rx_fingerprint
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
index 3a4c5bc..ae9150b 100644
--- a/buildsystem/dependencies.gradle
+++ b/buildsystem/dependencies.gradle
@@ -1,7 +1,7 @@
ext {
android_build = [
- build_tools: '26.0.2',
- compile_sdk: 26,
+ build_tools: '28.0.2',
+ compile_sdk: 28,
min_sdk : 19,
target_sdk : 21
]
@@ -9,11 +9,11 @@ ext {
versions = [
common : [
java : JavaVersion.VERSION_1_8,
- kotlin : '1.1.60'
+ kotlin : '1.3.10'
],
build_plugins: [
- gradle : '3.0.0',
+ gradle : '3.5.2',
fabric : '1.+'
],
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f805aed..f951e33 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 31 11:48:56 IST 2017
+#Sun Nov 17 15:06:57 IST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment