Merge b619daa into master-4.0

Author: realm-ci

Dockerfile

@@ -52,7 +52,7 @@ RUN sdkmanager --update
 RUN sdkmanager 'platform-tools'
 RUN sdkmanager 'build-tools;26.0.1'
 RUN sdkmanager 'extras;android;m2repository'
-RUN sdkmanager 'platforms;android-25'
+RUN sdkmanager 'platforms;android-26'
 
 # Install the NDK
 RUN mkdir /opt/android-ndk-tmp && \

README.md

@@ -60,7 +60,7 @@ In case you don't want to use the precompiled version, you can build Realm yours
 ### Prerequisites
 
  * Download the [**JDK 7**](http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html) or [**JDK 8**](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) from Oracle and install it.
- * Download & install the Android SDK **Build-Tools 26.0.1**, **Android N (API 25)** (for example through Android Studio’s **Android SDK Manager**).
+ * Download & install the Android SDK **Build-Tools 26.0.1**, **Android O (API 26)** (for example through Android Studio’s **Android SDK Manager**).
  * Install CMake from SDK manager in Android Studio ("SDK Tools" -> "CMake").
  * If you use Android Studio, Android Studio 3.0 or later is required.
 

examples/build.gradle

@@ -1,4 +1,4 @@
-project.ext.sdkVersion = 25
+project.ext.sdkVersion = 26
 project.ext.buildTools = '26.0.1'
 
 // Don't cache SNAPSHOT (changing) dependencies.

examples/kotlinExample/src/main/kotlin/io/realm/examples/kotlin/KotlinExampleActivity.kt

@@ -42,7 +42,7 @@ class KotlinExampleActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_realm_basic_example)
-        rootLayout = findViewById(R.id.container) as LinearLayout
+        rootLayout = findViewById(R.id.container)
         rootLayout.removeAllViews()
 
         // These operations are small enough that

examples/newsreaderExample/build.gradle

@@ -34,9 +34,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //noinspection GradleDependency
-    implementation 'com.android.support:appcompat-v7:25.2.0'
+    implementation 'com.android.support:appcompat-v7:26.0.1'
     //noinspection GradleDependency
-    implementation 'com.android.support:design:25.2.0'
+    implementation 'com.android.support:design:26.0.1'
     implementation 'io.reactivex:rxjava:1.1.0'
     implementation 'io.reactivex:rxandroid:1.1.0'
     implementation 'com.squareup.retrofit:retrofit:2.0.0-beta2'

examples/objectServerExample/build.gradle

@@ -60,9 +60,9 @@ realm {
 }
 
 dependencies {
-    implementation 'com.android.support:support-v4:25.2.0'
-    implementation 'com.android.support:appcompat-v7:25.2.0'
-    implementation 'com.android.support:design:25.2.0'
+    implementation 'com.android.support:support-v4:26.0.1'
+    implementation 'com.android.support:appcompat-v7:26.0.1'
+    implementation 'com.android.support:design:26.0.1'
     implementation 'me.zhanghai.android.materialprogressbar:library:1.3.0'
     implementation 'com.jakewharton:butterknife:8.5.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'

examples/secureTokenAndroidKeyStore/build.gradle

@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "io.realm.examples.securetokenandroidkeystore"
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
@@ -32,7 +32,7 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:25.2.0'
+    implementation 'com.android.support:appcompat-v7:26.0.1'
     testImplementation 'junit:junit:4.12'
     implementation 'io.realm:secure-userstore:1.0.1'
 }

library-benchmarks/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'realm-android'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion "26.0.1"
 
     defaultConfig {

realm/realm-annotations-processor/build.gradle

@@ -15,7 +15,7 @@ dependencies {
     testCompile files("${System.properties['java.home']}/../lib/tools.jar") // This is needed otherwise compile-testing won't be able to find it
     testCompile group:'junit', name:'junit', version:'4.12'
     testCompile group:'com.google.testing.compile', name:'compile-testing', version:'0.6'
-    testCompile files(file("${System.env.ANDROID_HOME}/platforms/android-25/android.jar"))
+    testCompile files(file("${System.env.ANDROID_HOME}/platforms/android-26/android.jar"))
 }
 
 // for Ant filter

realm/realm-library/build.gradle

@@ -39,7 +39,7 @@ ext.lcachePath = project.findProperty('lcachePath') ?: System.getenv('NDK_LCACHE
 ext.enableDebugCore = project.hasProperty('enableDebugCore') ? project.getProperty('enableDebugCore') : false
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion '26.0.1'
 
     defaultConfig {
@@ -184,8 +184,8 @@ dependencies {
     kaptAndroidTest project(':realm-annotations-processor')
     androidTestImplementation fileTree(dir: 'testLibs', include: ['*.jar'])
     androidTestImplementation 'io.reactivex:rxjava:1.1.0'
-    androidTestImplementation 'com.android.support.test:runner:0.5'
-    androidTestImplementation 'com.android.support.test:rules:0.5'
+    androidTestImplementation 'com.android.support.test:runner:1.0.0'
+    androidTestImplementation 'com.android.support.test:rules:1.0.0'
     androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'