Upgrade Android version and Gradle version

abacritt · Sep 3, 2016 · b4ff828 · b4ff828
1 parent ee8d21a
commit b4ff828
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "in.abacritt.android.sectionedmergeadapterdemoapp"
@@ -22,7 +22,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':sectionedmergeadapter')
+    compile project(':library')
 
-    compile 'com.android.support:appcompat-v7:24.1.1'
+    compile 'com.android.support:appcompat-v7:24.2.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.3'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sat Sep 03 22:19:44 IST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/sectionedmergeadapter/.gitignore → library/.gitignore b/sectionedmergeadapter/.gitignore → library/.gitignore
diff --git a/sectionedmergeadapter/build.gradle → library/build.gradle b/sectionedmergeadapter/build.gradle → library/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }

diff --git a/sectionedmergeadapter/proguard-rules.pro → library/proguard-rules.pro b/sectionedmergeadapter/proguard-rules.pro → library/proguard-rules.pro
diff --git a/...mergeadapter/src/main/AndroidManifest.xml → library/src/main/AndroidManifest.xml b/...mergeadapter/src/main/AndroidManifest.xml → library/src/main/AndroidManifest.xml
diff --git a/...ndroid/library/SectionedMergeAdapter.java → ...ndroid/library/SectionedMergeAdapter.java b/...ndroid/library/SectionedMergeAdapter.java → ...ndroid/library/SectionedMergeAdapter.java
diff --git a/...geadapter/src/main/res/values/strings.xml → library/src/main/res/values/strings.xml b/...geadapter/src/main/res/values/strings.xml → library/src/main/res/values/strings.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':sectionedmergeadapter'
+include ':app', ':library'