libraries updated; sorting mode fix

eprst · Oct 9, 2015 · 263b577 · 263b577
1 parent 784fb92
commit 263b577
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -71,8 +71,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -88,12 +88,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="annotations-12.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
     <orderEntry type="module" module-name="ColorPickerPreference" exported="" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,31 +1,31 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "com.kos.ktodo"
         minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 29
-        versionName "2.0"
+        targetSdkVersion 23
+        versionCode 30
+        versionName "2.1"
+    }
+    lintOptions {
+        abortOnError false
     }
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    lintOptions {
-        abortOnError false
-    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile 'com.android.support:support-v4:22.2.1'
+    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.android.support:support-v4:23.0.1'
     //noinspection GradleDynamicVersion
     compile 'com.intellij:annotations:+@jar'
     compile project(":ColorPickerPreference")

diff --git a/app/src/main/java/com/kos/ktodo/TodoItemsSortingMode.java b/app/src/main/java/com/kos/ktodo/TodoItemsSortingMode.java
@@ -10,7 +10,7 @@
 public enum TodoItemsSortingMode {
 	PRIO_DUE_SUMMARY(prio_due_summary, TODO_DONE, TODO_PRIO, TODO_DUE_DATE, TODO_SUMMARY),
 	DUE_PRIO_SUMMARY(due_prio_summary, TODO_DONE, TODO_DUE_DATE, TODO_PRIO, TODO_SUMMARY),
-	PRIO_SUMMARY_DUE(prio_summary_due, TODO_DONE, TODO_SUMMARY, TODO_DUE_DATE),
+	PRIO_SUMMARY_DUE(prio_summary_due, TODO_DONE, TODO_PRIO, TODO_SUMMARY, TODO_DUE_DATE),
 	SUMMARY_PRIO_DUE(summary_prio_due, TODO_DONE, TODO_SUMMARY, TODO_PRIO, TODO_DUE_DATE),
 	DUE_SUMMARY_PRIO(due_summary_prio, TODO_DONE, TODO_DUE_DATE, TODO_SUMMARY, TODO_PRIO),
 	SUMMARY_DUE_PRIO(summary_due_prio, TODO_DONE, TODO_SUMMARY, TODO_DUE_DATE, TODO_PRIO);

diff --git a/mappings/mapping_2_1.7z b/mappings/mapping_2_1.7z