From c6ea23838e2ad36215aba6ea45221bf3163976cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=B8rbech?= Date: Wed, 15 Nov 2023 14:12:47 +0100 Subject: [PATCH 1/2] Fail build if metric collection fails on CI --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f92001139b..e39f7d87b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -85,7 +85,7 @@ pipeline { ANDROID_NDK_HOME="${NDK_HOME}" REALM_DISABLE_ANALYTICS=true REALM_PRINT_ANALYTICS=true - REALM_FAIL_ON_ANALYTICS_ERRORS=false + REALM_FAIL_ON_ANALYTICS_ERRORS=true JAVA_8='/Library/Java/JavaVirtualMachines/jdk1.8.0_301.jdk/Contents/Home' JAVA_11='/Library/Java/JavaVirtualMachines/jdk-11.0.12.jdk/Contents/Home' JAVA_17='/Library/Java/JavaVirtualMachines/jdk-17.0.2.jdk/Contents/Home' From 8bf49db3130c0684578dfb5f65bd40c03a2a75bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=B8rbech?= Date: Fri, 17 Nov 2023 12:43:50 +0100 Subject: [PATCH 2/2] Bump Kotlin version in min-android-sample --- examples/min-android-sample/build.gradle.kts | 4 ++-- examples/min-android-sample/gradle.properties | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/min-android-sample/build.gradle.kts b/examples/min-android-sample/build.gradle.kts index 5185370ae5..b3e600001b 100644 --- a/examples/min-android-sample/build.gradle.kts +++ b/examples/min-android-sample/build.gradle.kts @@ -14,8 +14,8 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:4.1.3") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20") + classpath("com.android.tools.build:gradle:4.2.2") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0") classpath("io.realm.kotlin:gradle-plugin:${rootProject.extra["realmVersion"]}") } } diff --git a/examples/min-android-sample/gradle.properties b/examples/min-android-sample/gradle.properties index f39955e794..6fbc901e89 100644 --- a/examples/min-android-sample/gradle.properties +++ b/examples/min-android-sample/gradle.properties @@ -16,3 +16,5 @@ kotlin.code.style=official android.useAndroidX=true org.gradle.configuration-cache=true + +kotlin.mpp.androidSourceSetLayoutVersion=1