bump sdk version

8 files changed, 29 insertions, 37 deletions

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c77..4c65fbe6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,6 +12,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useAutoImport" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index d80eed3c..94bec189 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMapEmbedSources" />
+    <option name="sourceMapPrefix" />
+  </component>
   <component name="KotlinCommonCompilerArguments">
-    <option name="languageVersion" value="1.0" />
     <option name="apiVersion" value="1.0" />
+    <option name="languageVersion" value="1.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index e3105218..d1ec1b8f 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -55,6 +55,7 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
@@ -63,7 +64,6 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -121,44 +121,37 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="anko-sdk25-coroutines-0.10.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="orma-4.2.5" level="project" />
+    <orderEntry type="library" exported="" name="support-v13-26.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="orma-migration-4.2.5" level="project" />
     <orderEntry type="library" exported="" name="haha-2.0.3" level="project" />
     <orderEntry type="library" exported="" name="library-3.3.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="anko-support-v4-commons-0.10.1" level="project" />
-    <orderEntry type="library" exported="" name="kotlinx-coroutines-core-0.15" level="project" />
-    <orderEntry type="library" exported="" name="anko-sqlite-0.10.1" level="project" />
-    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="anko-appcompat-v7-0.10.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="crashlytics-core-2.3.17" level="project" />
     <orderEntry type="library" exported="" name="antlr4-runtime-4.6" level="project" />
     <orderEntry type="library" exported="" name="kotlin-stdlib-jre7-1.1.51" level="project" />
-    <orderEntry type="library" exported="" name="anko-coroutines-0.10.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v13-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="rxandroid-2.0.1" level="project" />
     <orderEntry type="library" exported="" name="twitter4j-stream-4.0.6" level="project" />
     <orderEntry type="library" exported="" name="rxjava-2.0.9" level="project" />
-    <orderEntry type="library" exported="" name="anko-support-v4-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-analyzer-1.5.4" level="project" />
-    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="kotlinx-coroutines-android-0.15" level="project" />
     <orderEntry type="library" exported="" name="reactive-streams-1.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="fabric-1.3.17" level="project" />
-    <orderEntry type="library" exported="" name="anko-sdk25-0.10.1" level="project" />
-    <orderEntry type="library" exported="" name="anko-appcompat-v7-coroutines-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="annotations-13.0" level="project" />
-    <orderEntry type="library" exported="" name="anko-appcompat-v7-commons-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="beta-1.2.5" level="project" />
-    <orderEntry type="library" exported="" name="anko-0.10.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-26.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-26.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-26.1.0" level="project" />
+    <orderEntry type="library" exported="" name="runtime-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="anko-commons-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="answers-1.3.13" level="project" />
     <orderEntry type="library" exported="" name="kotlin-stdlib-1.1.51" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="common-1.0.0" level="project" />
+    <orderEntry type="library" exported="" name="1_common-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="volley-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="twitter4j-media-support-4.0.6" level="project" />
     <orderEntry type="library" exported="" name="crouton-1.8.5" level="project" />
@@ -167,8 +160,6 @@
     <orderEntry type="library" exported="" name="crashlytics-2.6.8" level="project" />
     <orderEntry type="library" exported="" name="twitter4j-core-4.0.6" level="project" />
     <orderEntry type="library" exported="" name="twitter-text-1.14.7" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-watcher-1.5.4" level="project" />
-    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e7ffccd9..f21b0c23 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,13 +10,13 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         applicationId "jp.rhe.smileessence3"
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 26
 
         versionName "git -C ${rootDir} describe --tags --long --dirty --always".execute().text.trim()
         versionCode "git -C ${rootDir} rev-list HEAD --count".execute().text.trim().toInteger()
@@ -62,11 +62,12 @@ android {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
-    compile 'com.android.support:support-v4:25.+'
-    compile 'com.android.support:support-v13:25.+'
+    //compile 'com.android.support:support-v4:26.1.0'
+    compile 'com.android.support:support-core-ui:26.1.0'
+    compile 'com.android.support:support-v13:26.1.0'
 
-    // Anko
-    compile "org.jetbrains.anko:anko:$anko_version"
+    // Anko; not using Anko Layouts and Anko SQLite for now
+    compile "org.jetbrains.anko:anko-commons:$anko_version"
 
     // volley
     compile 'com.android.volley:volley:1.0.0'
@@ -97,6 +98,3 @@ dependencies {
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
     release2Compile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
 }
-repositories {
-    mavenCentral()
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
index 91b6311d..b2c9e163 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
@@ -59,7 +59,7 @@ class MainActivity : Activity(), ViewPager.OnPageChangeListener {
         Application.getWorld(userId)
     }
     private val pagerAdapter by lazy { PageListAdapter(this) }
-    private val currentAccountIconImageView by lazy { findViewById(android.R.id.home) as ImageView }
+    private val currentAccountIconImageView by lazy { findViewById<ImageView>(android.R.id.home) }
 
     private fun setSelectedPageIndex(position: Int, smooth: Boolean = true) {
         viewPager.setCurrentItem(position, smooth)
diff --git a/app/src/main/java/net/lacolaco/smileessence/data/Account.kt b/app/src/main/java/net/lacolaco/smileessence/data/Account.kt
index 6dc8262c..c95fcc74 100644
--- a/app/src/main/java/net/lacolaco/smileessence/data/Account.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/data/Account.kt
@@ -27,7 +27,6 @@ package net.lacolaco.smileessence.data
 import com.github.gfx.android.orma.annotation.Column
 import com.github.gfx.android.orma.annotation.PrimaryKey
 import com.github.gfx.android.orma.annotation.Table
-import net.lacolaco.smileessence.data.Account.Companion.cache
 import net.lacolaco.smileessence.entity.User
 import twitter4j.Twitter
 import twitter4j.TwitterFactory
diff --git a/app/src/main/java/net/lacolaco/smileessence/data/OrmaHolder.kt b/app/src/main/java/net/lacolaco/smileessence/data/OrmaHolder.kt
index f05f4def..aa5f81df 100644
--- a/app/src/main/java/net/lacolaco/smileessence/data/OrmaHolder.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/data/OrmaHolder.kt
@@ -1,7 +1,6 @@
 package net.lacolaco.smileessence.data
 
 import android.content.Context
-import com.github.gfx.android.orma.AccessThreadConstraint
 
 object OrmaHolder {
     lateinit var orma: OrmaDatabase
@@ -10,7 +9,6 @@ object OrmaHolder {
     fun initialize(context: Context) {
         orma = OrmaDatabase
                 .builder(context)
-                .writeOnMainThread(AccessThreadConstraint.WARNING)
                 .build()
     }
 }
diff --git a/build.gradle b/build.gradle
index 06ebf25f..da9833a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,7 @@ allprojects {
     repositories {
         jcenter()
         mavenCentral()
+        maven { url 'https://maven.google.com' }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url 'https://maven.fabric.io/public' }
     }