Merge pull request #79 from magneticflux-/master

Large Android update, misc. bugfixes
plattysoft · Jul 16, 2017 · 49dffb3 · 49dffb3
2 parents c0375fc + 554a9b9
commit 49dffb3
Show file tree

Hide file tree

Showing 16 changed files with 181 additions and 267 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,10 @@
 .gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
 build/
 *.iml
+*.jar
+!gradle-wrapper.jar
+*.apk
+local.properties
+.idea/
+!LeonidasExamples.apk
+!LeonidsLib.jar
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/LeonidsExamples/build.gradle b/LeonidsExamples/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.plattysoft.leonids.examples"
         minSdkVersion 11
-        targetSdkVersion 21
+        targetSdkVersion 25
     }
 
     buildTypes {

diff --git a/LeonidsLib/build.gradle b/LeonidsLib/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'com.jfrog.bintray'
 def versionName = '1.3.2'
 
 android {
-    compileSdkVersion 15
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 11
-        targetSdkVersion 17
+        targetSdkVersion 25
     }
 
     buildTypes {