diff --git a/Makefile b/Makefile index db6e5a93..8767e880 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ release: clean clean: rm -rf ./app/build + rm -rf ./libs ; git checkout libs uninstall: adb uninstall ch.blinkenlights.android.vanilla diff --git a/app/build.gradle b/app/build.gradle index 5146c89e..c46da635 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,12 +6,12 @@ android { disable 'ExtraTranslation' } - compileSdkVersion 28 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "ch.blinkenlights.android.vanilla" - minSdkVersion 15 - targetSdkVersion 28 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion } buildTypes { @@ -29,6 +29,7 @@ android { dependencies { implementation 'com.android.support:support-core-ui:28.0.0' + implementation project(':dialogplus') compileOnly 'com.android.support:support-annotations:28.0.0' compileOnly 'junit:junit:4.12' } diff --git a/build.gradle b/build.gradle index 66feddae..35f82633 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.1.3' } } allprojects { @@ -13,3 +13,8 @@ allprojects { jcenter() } } +ext { + compileSdkVersion = 28 + targetSdkVersion = 28 + minSdkVersion = 15 +} diff --git a/settings.gradle b/settings.gradle index af1a9988..34c471ad 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,4 @@ -include ":app" +include "app" +include "dialogplus" + +project(':dialogplus').projectDir = new File('./libs/dialogplus/dialogplus')