chore: Upgrade Kotlin side to match YouVersion Kotlin SDK 1.0.1 (#41)

sidorchukandrew · web-flow · commit 8d7985806114 · 2026-04-06T20:22:44.000-04:00
* chore: bump Kotlin SDK to 1.0.1

* chore: set required Kotlin version to 2.3.0 in example app

* chore: update UI views to use Expo 55

* chore: update Kotlin wrappers to match Kotlin SDK 1.0.1

* chore: use appropriate `Host` for each platform

* chore: clean up unused imports and arguments

* fixup! chore: update UI views to use Expo 55
diff --git a/android/build.gradle b/android/build.gradle
@@ -60,7 +60,7 @@ dependencies {
   implementation 'androidx.compose.foundation:foundation-android:1.9.1'
   implementation 'androidx.compose.material3:material3-android:1.3.2'
 
-  implementation 'com.youversion.platform:platform-core:0.6.0'
-  implementation 'com.youversion.platform:platform-ui:0.6.0'
-  implementation 'com.youversion.platform:platform-reader:0.6.0'
+  implementation 'com.youversion.platform:platform-core:1.0.1'
+  implementation 'com.youversion.platform:platform-ui:1.0.1'
+  implementation 'com.youversion.platform:platform-reader:1.0.1'
 }
diff --git a/android/src/main/java/com/youversion/reactnativesdk/RNYouVersionPlatformModule.kt b/android/src/main/java/com/youversion/reactnativesdk/RNYouVersionPlatformModule.kt
@@ -57,12 +57,8 @@ class RNYouVersionPlatformModule : Module() {
         }
 
         AsyncFunction("chapter") Coroutine { bibleReference: BibleReferenceRecord ->
-            val context = appContext.reactContext
-                ?: throw IllegalStateException("ReactContext is not available yet")
-
             return@Coroutine YVPBibleApi.chapter(
-                bibleReference = bibleReference,
-                context = context
+                bibleReference = bibleReference
             )
         }
 
diff --git a/android/src/main/java/com/youversion/reactnativesdk/api/YVPBibleApi.kt b/android/src/main/java/com/youversion/reactnativesdk/api/YVPBibleApi.kt
@@ -2,14 +2,20 @@ package com.youversion.reactnativesdk.api
 
 import android.content.Context
 import com.youversion.platform.core.api.YouVersionApi
-import com.youversion.platform.core.bibles.domain.BibleReference
-import com.youversion.platform.core.bibles.domain.BibleVersionRepository
 
 object YVPBibleApi {
     suspend fun versions(languageTag: String?): List<BibleVersionRecord> {
-        val response = YouVersionApi.bible.versions(languageTag)
-        val records = response.map { BibleVersionRecord(it) }
-        return records
+        val allResults = mutableListOf<BibleVersionRecord>()
+        var pageToken: String? = null
+
+        do {
+            val response = YouVersionApi.bible.versions(languageTag, pageToken = pageToken)
+            allResults.addAll(response.data.map { BibleVersionRecord(it) })
+
+            pageToken = response.nextPageToken
+        } while (pageToken != null)
+
+        return allResults
     }
 
     suspend fun version(versionId: Int): BibleVersionRecord {
@@ -18,15 +24,14 @@ object YVPBibleApi {
         return record
     }
 
-    suspend fun chapter(bibleReference: BibleReferenceRecord, context: Context): String {
-        val response = BibleVersionRepository(context).chapter(
-            reference = BibleReference(
-                versionId = bibleReference.versionId,
-                bookUSFM = bibleReference.bookUSFM,
-                chapter = bibleReference.chapter,
-            )
+    suspend fun chapter(bibleReference: BibleReferenceRecord): String {
+        val passageId = bibleReference.bookUSFM + "." + bibleReference.chapter.toString()
+
+        val response = YouVersionApi.bible.passage(
+            versionId = bibleReference.versionId,
+            passageId = passageId
         )
 
-        return response
+        return response.content
     }
 }
diff --git a/android/src/main/java/com/youversion/reactnativesdk/api/YVPLanguagesApi.kt b/android/src/main/java/com/youversion/reactnativesdk/api/YVPLanguagesApi.kt
@@ -4,8 +4,16 @@ import com.youversion.platform.core.api.YouVersionApi
 
 object YVPLanguagesApi {
     suspend fun languages(country: String?): List<LanguageRecord> {
-        val response = YouVersionApi.languages.languages(country)
-        val records = response.map { LanguageRecord(it) }
-        return records
+        val allResults = mutableListOf<LanguageRecord>()
+        var pageToken: String? = null
+
+        do {
+            val response = YouVersionApi.languages.languages(country, pageToken = pageToken)
+            allResults.addAll(response.data.map { LanguageRecord(it) })
+
+            pageToken = response.nextPageToken
+        } while (pageToken != null)
+
+        return allResults
     }
 }
diff --git a/android/src/main/java/com/youversion/reactnativesdk/api/YVPRecords.kt b/android/src/main/java/com/youversion/reactnativesdk/api/YVPRecords.kt
@@ -23,23 +23,23 @@ data class YouVersionVerseOfTheDayRecord(
 
 data class LanguageRecord(
     @Field
-    val id: String,
+    val id: String?,
     @Field
-    val language: String,
+    val language: String?,
     @Field
     val script: String?,
     @Field
     val scriptName: String?,
     @Field
-    val aliases: List<String>,
+    val aliases: List<String>?,
     @Field
-    val displayNames: Map<String, String>,
+    val displayNames: Map<String, String>?,
     @Field
-    val scripts: List<String>,
+    val scripts: List<String>?,
     @Field
-    val variants: List<String>,
+    val variants: List<String>?,
     @Field
-    val countries: List<String>,
+    val countries: List<String>?,
     @Field
     val textDirection: String,
     @Field
diff --git a/android/src/main/java/com/youversion/reactnativesdk/views/YVPBibleReaderView.kt b/android/src/main/java/com/youversion/reactnativesdk/views/YVPBibleReaderView.kt
@@ -8,6 +8,7 @@ import androidx.compose.ui.Modifier
 import com.youversion.platform.core.bibles.domain.BibleReference
 import com.youversion.platform.reader.BibleReader
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.ExpoComposeView
 
@@ -30,7 +31,7 @@ class YVPBibleReaderView(context: Context, appContext: AppContext) :
     override val props = BibleReaderViewProps()
 
     @Composable
-    override fun Content(modifier: Modifier) {
+    override fun ComposableScope.Content() {
         BibleReader(
             appName = props.appName.value ?: "",
             appSignInMessage = props.signInMessage.value ?: "",
diff --git a/android/src/main/java/com/youversion/reactnativesdk/views/YVPBibleTextView.kt b/android/src/main/java/com/youversion/reactnativesdk/views/YVPBibleTextView.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
+import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.ExpoComposeView
 
@@ -43,10 +44,10 @@ class YVPBibleTextView(context: Context, appContext: AppContext) :
     private val onTap by EventDispatcher()
 
     @Composable
-    override fun Content(modifier: Modifier) {
+    override fun ComposableScope.Content() {
         // TODO: Replace with actual BibleText composable when Kotlin SDK is ready
         Box(
-            modifier = modifier
+            modifier = Modifier
                 .fillMaxWidth()
                 .padding(16.dp)
         ) {
diff --git a/android/src/main/java/com/youversion/reactnativesdk/views/YVPBibleWidgetView.kt b/android/src/main/java/com/youversion/reactnativesdk/views/YVPBibleWidgetView.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.ExpoComposeView
 
@@ -36,7 +37,7 @@ class YVPBibleWidgetView(context: Context, appContext: AppContext) :
     override val props = BibleWidgetViewProps()
 
     @Composable
-    override fun Content(modifier: Modifier) {
+    override fun ComposableScope.Content() {
         val isDark = when (props.colorScheme.value) {
             "dark" -> true
             "light" -> false
@@ -45,7 +46,7 @@ class YVPBibleWidgetView(context: Context, appContext: AppContext) :
 
         // TODO: Replace with actual BibleWidget composable when Kotlin SDK is ready
         Box(
-            modifier = modifier
+            modifier = Modifier
                 .fillMaxWidth()
                 .padding(16.dp)
         ) {
diff --git a/android/src/main/java/com/youversion/reactnativesdk/views/YVPSignInWithYouVersionButton.kt b/android/src/main/java/com/youversion/reactnativesdk/views/YVPSignInWithYouVersionButton.kt
@@ -5,17 +5,14 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Shape
 import com.youversion.platform.ui.views.SignInWithYouVersionButton
 import com.youversion.platform.ui.views.SignInWithYouVersionButtonDefaults
 import com.youversion.platform.ui.views.SignInWithYouVersionButtonMode
 import expo.modules.kotlin.AppContext
-import expo.modules.kotlin.views.AutoSizingComposable
+import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
-import expo.modules.kotlin.views.Direction
 import expo.modules.kotlin.views.ExpoComposeView
-import java.util.EnumSet
 
 data class SignInWithYouVersionButtonProps(
     val mode: MutableState<String?> = mutableStateOf("full"),
@@ -30,16 +27,14 @@ class YVPSignInWithYouVersionButton(context: Context, appContext: AppContext) :
 //    private val onTap by EventDispatcher()
 
     @Composable
-    override fun Content(modifier: Modifier) {
-        AutoSizingComposable(shadowNodeProxy, axis = EnumSet.of(Direction.HORIZONTAL, Direction.VERTICAL)) {
-            SignInWithYouVersionButton(
-                mode = mode(),
-                stroked = stroked(),
-                shape = shape(),
-                dark = isDark(),
-                permissions = { HashSet() }
-            )
-        }
+    override fun ComposableScope.Content() {
+        SignInWithYouVersionButton(
+            mode = mode(),
+            stroked = stroked(),
+            shape = shape(),
+            dark = isDark(),
+            permissions = { HashSet() }
+        )
     }
 
     fun mode(): SignInWithYouVersionButtonMode {
diff --git a/android/src/main/java/com/youversion/reactnativesdk/views/YVPVotdView.kt b/android/src/main/java/com/youversion/reactnativesdk/views/YVPVotdView.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.ExpoComposeView
 
@@ -27,7 +28,7 @@ class YVPVotdView(context: Context, appContext: AppContext) :
     override val props = VotdViewProps()
 
     @Composable
-    override fun Content(modifier: Modifier) {
+    override fun ComposableScope.Content() {
         val isDark = when (props.colorScheme.value) {
             "dark" -> true
             "light" -> false
@@ -36,7 +37,7 @@ class YVPVotdView(context: Context, appContext: AppContext) :
 
         // TODO: Replace with actual VerseOfTheDay composable when Kotlin SDK is ready
         Box(
-            modifier = modifier
+            modifier = Modifier
                 .fillMaxWidth()
                 .padding(16.dp)
         ) {
diff --git a/example/app.json b/example/app.json
@@ -32,6 +32,9 @@
         {
           "ios": {
             "deploymentTarget": "17.0"
+          },
+          "android": {
+            "kotlinVersion": "2.3.0"
           }
         }
       ]
diff --git a/src/components/BibleReaderView.tsx b/src/components/BibleReaderView.tsx
@@ -1,12 +1,15 @@
-import { Host } from "@expo/ui/swift-ui";
+import { Host as AndroidHost } from "@expo/ui/jetpack-compose";
+import { Host as IosHost } from "@expo/ui/swift-ui";
 import { requireNativeView } from "expo";
-import { StyleSheet } from "react-native";
+import { Platform, StyleSheet } from "react-native";
 
 import { BibleReference } from "../types";
 
 const NativeView: React.ComponentType<NativeProps> =
   requireNativeView("BibleReaderView");
 
+const PlatformHost = Platform.OS === "ios" ? IosHost : AndroidHost;
+
 /**
  * A full-featured Bible reader component.
  * It allows the user to control font customizations, switch Bible versions and access their verse highlights.
@@ -15,13 +18,13 @@ const NativeView: React.ComponentType<NativeProps> =
  */
 export function BibleReaderView({ reference, ...props }: BibleReaderViewProps) {
   return (
-    <Host style={styles.view}>
+    <PlatformHost style={styles.view}>
       <NativeView
         hasReference={!!reference}
         {...(reference || {})}
         {...props}
       />
-    </Host>
+    </PlatformHost>
   );
 }
 
diff --git a/src/components/SignInWithYouVersionButton.tsx b/src/components/SignInWithYouVersionButton.tsx
@@ -1,7 +1,10 @@
-import { CommonViewModifierProps, Host } from "@expo/ui/swift-ui";
+import { Host as AndroidHost } from "@expo/ui/jetpack-compose";
+import { CommonViewModifierProps, Host as IosHost } from "@expo/ui/swift-ui";
 import { fixedSize } from "@expo/ui/swift-ui/modifiers";
 import { requireNativeView } from "expo";
-import { StyleProp, ViewStyle } from "react-native";
+import { Platform, StyleProp, ViewStyle } from "react-native";
+
+const PlatformHost = Platform.OS === "ios" ? IosHost : AndroidHost;
 
 const NativeView: React.ComponentType<NativeProps> = requireNativeView(
   "SignInWithYouVersionButton",
@@ -61,7 +64,7 @@ export function SignInWithYouVersionButton({
   ...props
 }: SignInWithYouVersionButtonProps) {
   return (
-    <Host matchContents={{ vertical: true, horizontal: true }} style={style}>
+    <PlatformHost matchContents style={style}>
       <NativeView
         {...props}
         mode={mode}
@@ -71,6 +74,6 @@ export function SignInWithYouVersionButton({
         onTap={onPress}
         modifiers={[fixedSize()]}
       />
-    </Host>
+    </PlatformHost>
   );
 }

Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,8 @@ class RNYouVersionPlatformModule : Module() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`AsyncFunction("chapter") Coroutine { bibleReference: BibleReferenceRecord ->`
`60`		`- val context = appContext.reactContext`
`61`		`- ?: throw IllegalStateException("ReactContext is not available yet")`
`62`		`-`
`63`	`60`	`return@Coroutine YVPBibleApi.chapter(`
`64`		`- bibleReference = bibleReference,`
`65`		`- context = context`
	`61`	`+ bibleReference = bibleReference`
`66`	`62`	`)`
`67`	`63`	`}`
`68`	`64`