From 5f06957136605cf8a2a18211334539a4e8d9416c Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 21 Aug 2017 11:31:05 +0200 Subject: [PATCH 1/3] CHANGE using API 15 --- app/build.gradle | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f2a7207..bcc49a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,35 +1,35 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" - defaultConfig { - applicationId "com.github.glomadrian.gravball" - minSdkVersion 16 - targetSdkVersion 25 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - vectorDrawables.useSupportLibrary = true - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + compileSdkVersion 25 + buildToolsVersion "25.0.2" + defaultConfig { + applicationId "com.github.glomadrian.gravball" + minSdkVersion 15 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + vectorDrawables.useSupportLibrary = true + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } - } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.jakewharton:butterknife:8.5.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' - compile project (':grav') - testCompile 'junit:junit:4.12' + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:design:25.3.1' + compile 'com.android.support.constraint:constraint-layout:1.0.2' + compile 'com.jakewharton:butterknife:8.5.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' + compile project(':grav') + testCompile 'junit:junit:4.12' } From 28ae765b394727d04f27af3a7829ec04e087769c Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 21 Aug 2017 13:00:09 +0200 Subject: [PATCH 2/3] Removed some lib construction dependencies --- grav/build.gradle | 51 +++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/grav/build.gradle b/grav/build.gradle index 81455e4..c20976d 100644 --- a/grav/build.gradle +++ b/grav/build.gradle @@ -1,45 +1,34 @@ apply plugin: 'com.android.library' -apply plugin: 'com.novoda.bintray-release' group = 'com.github.glomadrian' // Maven Group ID for the artifact version = '1.1' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 25 + buildToolsVersion "25.0.2" - defaultConfig { - minSdkVersion 14 - targetSdkVersion 25 - versionCode 12 - versionName "1.2" + defaultConfig { + minSdkVersion 14 + targetSdkVersion 25 + versionCode 12 + versionName "1.2" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } - } } def siteUrl = 'https://github.com/glomadrian/Grav' def gitUrl = 'https://github.com/glomadrian/Grav.git' - -publish { - userOrg = 'glomadrian' - groupId = group - artifactId = 'Grav' - publishVersion = '1.1' - desc = 'Configurable animations based on points' - website = siteUrl -} - dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - compile 'com.android.support:appcompat-v7:25.3.1' - testCompile 'junit:junit:4.12' + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.3.1' + testCompile 'junit:junit:4.12' } From afa83d39365f4d1c70f4308e388eb3487f4f7e26 Mon Sep 17 00:00:00 2001 From: HeinrichWesson Date: Fri, 25 Aug 2017 11:25:52 +0200 Subject: [PATCH 3/3] CHANGE Address a few TODOs --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 96789d1..e6cedce 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.0.0-beta3' classpath 'com.github.dcendents:android-maven-plugin:1.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1' classpath 'com.novoda:bintray-release:0.3.4'