From 28353fea8fb830bdb78ced0e11b8215085780891 Mon Sep 17 00:00:00 2001 From: DF1E Date: Thu, 14 Aug 2014 11:57:19 +0200 Subject: [PATCH] update gradle and manifest --- .gitignore | 1 + Turbo Editor/build.gradle | 13 +++++++++---- Turbo Editor/src/main/AndroidManifest.xml | 4 ++-- .../demo_changelog_fragment_dialogstandard.xml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f94a449..812c2dd 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ proguard/ /local.properties /.idea/workspace.xml .DS_Store +/build /Turbo Editor/build/ \ No newline at end of file diff --git a/Turbo Editor/build.gradle b/Turbo Editor/build.gradle index c389acc..74a57bf 100644 --- a/Turbo Editor/build.gradle +++ b/Turbo Editor/build.gradle @@ -3,9 +3,10 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.6.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } + apply plugin: 'android' repositories { @@ -13,11 +14,15 @@ repositories { } android { - compileSdkVersion 18 - buildToolsVersion "18.1.0" + compileSdkVersion 19 + buildToolsVersion "19.1" defaultConfig { - minSdkVersion 15 + minSdkVersion 16 + } + + lintOptions { + abortOnError false } } diff --git a/Turbo Editor/src/main/AndroidManifest.xml b/Turbo Editor/src/main/AndroidManifest.xml index 14c8b02..ac05d60 100644 --- a/Turbo Editor/src/main/AndroidManifest.xml +++ b/Turbo Editor/src/main/AndroidManifest.xml @@ -25,8 +25,8 @@ android:installLocation="auto"> + android:minSdkVersion="16" + android:targetSdkVersion="19" /> diff --git a/Turbo Editor/src/main/res/layout/demo_changelog_fragment_dialogstandard.xml b/Turbo Editor/src/main/res/layout/demo_changelog_fragment_dialogstandard.xml index 0a9a1ba..962f085 100644 --- a/Turbo Editor/src/main/res/layout/demo_changelog_fragment_dialogstandard.xml +++ b/Turbo Editor/src/main/res/layout/demo_changelog_fragment_dialogstandard.xml @@ -1,5 +1,5 @@ -