From b44fcdf9e9ae4b9d252391ee2b9ceff9849a255d Mon Sep 17 00:00:00 2001 From: David Date: Mon, 9 Nov 2015 20:55:30 +0100 Subject: [PATCH] Update AppCompat Update to SDK 23.0.1 --- .idea/gradle.xml | 20 +++++++++++++++++++ .idea/libraries/appcompat_v7_23_0_0.xml | 10 ---------- .idea/libraries/appcompat_v7_23_1_0.xml | 15 ++++++++++++++ .idea/libraries/design_23_0_0.xml | 10 ---------- .idea/libraries/design_23_1_0.xml | 15 ++++++++++++++ .idea/libraries/recyclerview_v7_23_1_0.xml | 15 ++++++++++++++ .../libraries/support_annotations_23_0_0.xml | 11 ---------- .../libraries/support_annotations_23_1_0.xml | 11 ++++++++++ .idea/libraries/support_v4_23_0_0.xml | 11 ---------- .idea/libraries/support_v4_23_1_0.xml | 16 +++++++++++++++ PlayMusicExporter.iml | 19 ++++++++++++++++++ build.gradle | 5 ++--- framework/build.gradle | 4 ++-- framework/framework.iml | 8 ++++---- playmusicexporter/build.gradle | 8 ++++---- playmusicexporter/playmusicexporter.iml | 16 +++++++++------ playmusiclib/build.gradle | 2 +- playmusiclib/playmusiclib.iml | 4 ++-- 18 files changed, 136 insertions(+), 64 deletions(-) create mode 100644 .idea/gradle.xml delete mode 100644 .idea/libraries/appcompat_v7_23_0_0.xml create mode 100644 .idea/libraries/appcompat_v7_23_1_0.xml delete mode 100644 .idea/libraries/design_23_0_0.xml create mode 100644 .idea/libraries/design_23_1_0.xml create mode 100644 .idea/libraries/recyclerview_v7_23_1_0.xml delete mode 100644 .idea/libraries/support_annotations_23_0_0.xml create mode 100644 .idea/libraries/support_annotations_23_1_0.xml delete mode 100644 .idea/libraries/support_v4_23_0_0.xml create mode 100644 .idea/libraries/support_v4_23_1_0.xml create mode 100644 PlayMusicExporter.iml diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..eb82d02 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_23_0_0.xml b/.idea/libraries/appcompat_v7_23_0_0.xml deleted file mode 100644 index e7bc2ad..0000000 --- a/.idea/libraries/appcompat_v7_23_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_23_1_0.xml b/.idea/libraries/appcompat_v7_23_1_0.xml new file mode 100644 index 0000000..880bcd3 --- /dev/null +++ b/.idea/libraries/appcompat_v7_23_1_0.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/design_23_0_0.xml b/.idea/libraries/design_23_0_0.xml deleted file mode 100644 index 8ee845f..0000000 --- a/.idea/libraries/design_23_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/design_23_1_0.xml b/.idea/libraries/design_23_1_0.xml new file mode 100644 index 0000000..c3fbf03 --- /dev/null +++ b/.idea/libraries/design_23_1_0.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/recyclerview_v7_23_1_0.xml b/.idea/libraries/recyclerview_v7_23_1_0.xml new file mode 100644 index 0000000..cc4075c --- /dev/null +++ b/.idea/libraries/recyclerview_v7_23_1_0.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_0_0.xml b/.idea/libraries/support_annotations_23_0_0.xml deleted file mode 100644 index d2ff6bc..0000000 --- a/.idea/libraries/support_annotations_23_0_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_1_0.xml b/.idea/libraries/support_annotations_23_1_0.xml new file mode 100644 index 0000000..5d54766 --- /dev/null +++ b/.idea/libraries/support_annotations_23_1_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_0_0.xml b/.idea/libraries/support_v4_23_0_0.xml deleted file mode 100644 index fe1dc80..0000000 --- a/.idea/libraries/support_v4_23_0_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_1_0.xml b/.idea/libraries/support_v4_23_1_0.xml new file mode 100644 index 0000000..908cbb4 --- /dev/null +++ b/.idea/libraries/support_v4_23_1_0.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PlayMusicExporter.iml b/PlayMusicExporter.iml new file mode 100644 index 0000000..0037bb5 --- /dev/null +++ b/PlayMusicExporter.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 773d667..5924af4 100644 --- a/build.gradle +++ b/build.gradle @@ -30,14 +30,13 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.3.0' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files } } + allprojects { repositories { jcenter() } + } diff --git a/framework/build.gradle b/framework/build.gradle index 2e544db..bddebba 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 23 - buildToolsVersion "23.0.0" + buildToolsVersion "23.0.1" defaultConfig { minSdkVersion 8 @@ -42,5 +42,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' + compile 'com.android.support:appcompat-v7:23.1.0' } diff --git a/framework/framework.iml b/framework/framework.iml index 5bda1c8..f89f28a 100644 --- a/framework/framework.iml +++ b/framework/framework.iml @@ -1,5 +1,5 @@ - + @@ -89,8 +89,8 @@ - - - + + + \ No newline at end of file diff --git a/playmusicexporter/build.gradle b/playmusicexporter/build.gradle index e39871c..91e13b5 100644 --- a/playmusicexporter/build.gradle +++ b/playmusicexporter/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.0" + buildToolsVersion "23.0.1" defaultConfig { applicationId "de.arcus.playmusicexporter2" @@ -45,9 +45,9 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' - compile 'com.android.support:support-v4:23.0.0' - compile 'com.android.support:design:23.0.0' + compile 'com.android.support:appcompat-v7:23.1.0' + compile 'com.android.support:support-v4:23.1.0' + compile 'com.android.support:design:23.1.0' compile project(':framework') compile project(':playmusiclib') } diff --git a/playmusicexporter/playmusicexporter.iml b/playmusicexporter/playmusicexporter.iml index 47b0a5d..8016b6c 100644 --- a/playmusicexporter/playmusicexporter.iml +++ b/playmusicexporter/playmusicexporter.iml @@ -1,5 +1,5 @@ - + @@ -71,7 +71,10 @@ - + + + + @@ -89,10 +92,11 @@ - - - - + + + + + diff --git a/playmusiclib/build.gradle b/playmusiclib/build.gradle index b19ba5d..1ceac52 100644 --- a/playmusiclib/build.gradle +++ b/playmusiclib/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 23 - buildToolsVersion "23.0.0" + buildToolsVersion "23.0.1" defaultConfig { minSdkVersion 8 diff --git a/playmusiclib/playmusiclib.iml b/playmusiclib/playmusiclib.iml index d008674..63f6a1c 100644 --- a/playmusiclib/playmusiclib.iml +++ b/playmusiclib/playmusiclib.iml @@ -1,5 +1,5 @@ - + @@ -90,7 +90,7 @@ - + \ No newline at end of file