From b7dfba55d51763583ef584731ca566ce7faee77f Mon Sep 17 00:00:00 2001 From: Sandro Machado Date: Mon, 6 Jul 2015 00:54:00 +0100 Subject: [PATCH] Adding android maven plugin --- .idea/libraries/appcompat_v7_22_2_0.xml | 15 - .../libraries/support_annotations_22_2_0.xml | 11 - .idea/libraries/support_v4_22_2_0.xml | 16 - .idea/misc.xml | 2 +- .idea/workspace.xml | 309 ++++++++++-------- app/app.iml | 7 +- app/build.gradle | 6 +- app/src/main/AndroidManifest.xml | 8 +- app/src/main/res/values/styles.xml | 8 - build.gradle | 1 + 10 files changed, 187 insertions(+), 196 deletions(-) delete mode 100644 .idea/libraries/appcompat_v7_22_2_0.xml delete mode 100644 .idea/libraries/support_annotations_22_2_0.xml delete mode 100644 .idea/libraries/support_v4_22_2_0.xml delete mode 100644 app/src/main/res/values/styles.xml diff --git a/.idea/libraries/appcompat_v7_22_2_0.xml b/.idea/libraries/appcompat_v7_22_2_0.xml deleted file mode 100644 index 8581105..0000000 --- a/.idea/libraries/appcompat_v7_22_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_22_2_0.xml b/.idea/libraries/support_annotations_22_2_0.xml deleted file mode 100644 index 4cc0d93..0000000 --- a/.idea/libraries/support_annotations_22_2_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_22_2_0.xml b/.idea/libraries/support_v4_22_2_0.xml deleted file mode 100644 index 5700976..0000000 --- a/.idea/libraries/support_v4_22_2_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 01d38cd..c6922d8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,7 +13,7 @@ - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 01f6a75..8d6e2d6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -28,10 +28,10 @@ - + - + @@ -42,7 +42,17 @@ - + + + + + + + + + + + @@ -51,8 +61,8 @@ - - + + @@ -457,26 +467,6 @@ + + + + + + + + + Android Lint + + + Gradle + + + Probable bugsGradle + + + + + Android + + + + + @@ -2338,6 +2302,10 @@ + + + + @@ -2350,6 +2318,38 @@ + + + + + + + + + + + + + + + + + + - - - - - @@ -2391,6 +2387,9 @@ + + + @@ -2534,6 +2533,9 @@ + + + @@ -2545,36 +2547,44 @@ - + - - - - - - - - - - - + + + + + + + + + + + - + - - - + + + + + + - - - + - + + + + @@ -2588,6 +2598,14 @@ + + + + + + + + @@ -2608,17 +2626,48 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 911d922..a482cc0 100644 --- a/app/app.iml +++ b/app/app.iml @@ -91,8 +91,6 @@ - - @@ -108,10 +106,7 @@ - + - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 30a1474..dea9aa5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,15 @@ apply plugin: 'com.android.library' +apply plugin: 'android-maven' android { - compileSdkVersion 22 + compileSdkVersion 10 buildToolsVersion "22.0.1" defaultConfig { minSdkVersion 15 targetSdkVersion 22 versionCode 1 - versionName "1.0" + versionName "1.1" } buildTypes { release { @@ -28,5 +29,4 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:22.2.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c28085d..587dabe 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,9 +1,5 @@ - + - - - + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml deleted file mode 100644 index 766ab99..0000000 --- a/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/build.gradle b/build.gradle index 9405f3f..670632a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.github.dcendents:android-maven-plugin:1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files