Update Kotlin & NDK version (#771)

* Address breaking changes in Kotlin WpApiClient constructor

Also addresses the warnings about KoinContext no longer being required.

* Update Kotlin version to 2.1.21

* Update NDK version to `28.1.13356709`

* Update android-targetSdk to 36

* Update Docker ndk version

Author: oguzkocer

native/kotlin/api/android/build.gradle.kts

@@ -20,6 +20,11 @@ android {
     // to be manually installed: https://developer.android.com/build/releases/gradle-plugin#compatibility
     // Note that if the project's AGP version is not up to date, we need to find the correct release
     // notes from the list: https://developer.android.com/build/releases/past-releases (on the left side)
+    //
+    // TODO: The comment above is temporarily incorrect, as we are using a specific NDK version to
+    // test the 16kb page size changes. When we update AGP to a version that is packaged with NDK 
+    // version above `28`, we should remove this.
+    ndkVersion = "28.1.13356709"
 
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
@@ -112,4 +117,4 @@ project.afterEvaluate {
             }
         }
     }
-}
+}

native/kotlin/example/composeApp/src/androidMain/kotlin/rs/wordpress/example/ui/welcome/WelcomeActivity.kt

@@ -13,6 +13,7 @@ import rs.wordpress.api.kotlin.WpLoginClient
 import rs.wordpress.example.shared.App
 import rs.wordpress.example.shared.repository.AuthenticationRepository
 import androidx.core.net.toUri
+import rs.wordpress.api.kotlin.toURL
 import uniffi.wp_api.AutoDiscoveryAttemptSuccess
 
 class WelcomeActivity : ComponentActivity() {
@@ -60,8 +61,8 @@ class WelcomeActivity : ComponentActivity() {
                 val discoverySuccess = apiDiscoverySuccess
                     ?: throw IllegalStateException("Api discovery has to be successful before authentication")
                 authRepository.addAuthenticatedSite(
-                    discoverySuccess.parsedSiteUrl,
-                    discoverySuccess.apiRootUrl,
+                    discoverySuccess.parsedSiteUrl.toURL(),
+                    discoverySuccess.apiRootUrl.toURL(),
                     username,
                     password
                 )

native/kotlin/example/composeApp/src/commonMain/kotlin/rs/wordpress/example/shared/App.kt

@@ -5,7 +5,6 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import org.koin.compose.KoinContext
 import org.koin.compose.koinInject
 import rs.wordpress.example.shared.ui.login.LoginScreen
 import rs.wordpress.example.shared.ui.plugins.PluginListScreen
@@ -17,49 +16,47 @@ import rs.wordpress.example.shared.ui.welcome.WelcomeScreen
 
 @Composable
 fun App(authenticationEnabled: Boolean, authenticateSite: (String) -> Unit) {
-    KoinContext {
-        val userListViewModel = koinInject<UserListViewModel>()
-        val pluginListViewModel = koinInject<PluginListViewModel>()
-        val navController = rememberNavController()
+    val userListViewModel = koinInject<UserListViewModel>()
+    val pluginListViewModel = koinInject<PluginListViewModel>()
+    val navController = rememberNavController()
 
-        MaterialTheme {
-            NavHost(navController, startDestination = "welcome") {
-                composable("welcome") {
-                    WelcomeScreen(
-                        authenticationEnabled,
-                        onLoginClicked = {
-                            navController.navigate("login")
-                        },
-                        onSiteClicked = { authenticatedSite ->
-                            userListViewModel.setAuthenticatedSite(authenticatedSite)
-                            pluginListViewModel.setAuthenticatedSite(authenticatedSite)
-                            navController.navigate("site")
-                        }
-                    )
-                }
-                composable("login") {
-                    if (authenticationEnabled) {
-                        LoginScreen(authenticateSite)
-                    } else {
-                        throw IllegalStateException("Authentication is disabled")
+    MaterialTheme {
+        NavHost(navController, startDestination = "welcome") {
+            composable("welcome") {
+                WelcomeScreen(
+                    authenticationEnabled,
+                    onLoginClicked = {
+                        navController.navigate("login")
+                    },
+                    onSiteClicked = { authenticatedSite ->
+                        userListViewModel.setAuthenticatedSite(authenticatedSite)
+                        pluginListViewModel.setAuthenticatedSite(authenticatedSite)
+                        navController.navigate("site")
                     }
+                )
+            }
+            composable("login") {
+                if (authenticationEnabled) {
+                    LoginScreen(authenticateSite)
+                } else {
+                    throw IllegalStateException("Authentication is disabled")
                 }
-                composable("site") {
-                    SiteScreen(
-                        onUsersClicked = {
-                            navController.navigate("users")
-                        },
-                        onPluginsClicked = {
-                            navController.navigate("plugins")
-                        }
-                    )
-                }
-                composable("users") {
-                    UserListScreen()
-                }
-                composable("plugins") {
-                    PluginListScreen()
-                }
+            }
+            composable("site") {
+                SiteScreen(
+                    onUsersClicked = {
+                        navController.navigate("users")
+                    },
+                    onPluginsClicked = {
+                        navController.navigate("plugins")
+                    }
+                )
+            }
+            composable("users") {
+                UserListScreen()
+            }
+            composable("plugins") {
+                PluginListScreen()
             }
         }
     }

native/kotlin/example/composeApp/src/commonMain/kotlin/rs/wordpress/example/shared/ui/plugins/PluginListViewModel.kt

@@ -16,7 +16,7 @@ class PluginListViewModel(private val authRepository: AuthenticationRepository)
         apiClient = null
         authRepository.authenticationForSite(authenticatedSite)?.let {
             apiClient = WpApiClient(
-                apiRootUrl = authenticatedSite.apiRootUrl,
+                wpOrgSiteApiRootUrl = authenticatedSite.apiRootUrl,
                 authProvider = WpAuthenticationProvider.staticWithAuth(it)
             )
         }

native/kotlin/example/composeApp/src/commonMain/kotlin/rs/wordpress/example/shared/ui/users/UserListViewModel.kt

@@ -16,7 +16,7 @@ class UserListViewModel(private val authRepository: AuthenticationRepository) {
         apiClient = null
         authRepository.authenticationForSite(authenticatedSite)?.let {
             apiClient = WpApiClient(
-                apiRootUrl = authenticatedSite.apiRootUrl,
+                wpOrgSiteApiRootUrl = authenticatedSite.apiRootUrl,
                 authProvider = WpAuthenticationProvider.staticWithAuth(it)
             )
         }

native/kotlin/example/composeApp/src/commonMain/kotlin/rs/wordpress/example/shared/ui/welcome/WelcomeScreen.kt

@@ -11,7 +11,6 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import org.koin.compose.KoinContext
 import org.koin.compose.koinInject
 import rs.wordpress.example.shared.domain.AuthenticatedSite
 
@@ -22,27 +21,25 @@ fun WelcomeScreen(
     onLoginClicked: () -> Unit,
     onSiteClicked: (AuthenticatedSite) -> Unit
 ) {
-    KoinContext{
-        val welcomeViewModel = koinInject<WelcomeViewModel>()
+    val welcomeViewModel = koinInject<WelcomeViewModel>()
 
-        MaterialTheme {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center,
-                modifier = Modifier.fillMaxSize(),
-            ) {
-                if (authenticationEnabled) {
-                    Column {
-                        Button(onClick = onLoginClicked) {
-                            Text("Add new site")
-                        }
+    MaterialTheme {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+            modifier = Modifier.fillMaxSize(),
+        ) {
+            if (authenticationEnabled) {
+                Column {
+                    Button(onClick = onLoginClicked) {
+                        Text("Add new site")
                     }
                 }
-                LazyColumn {
-                    items(welcomeViewModel.getSiteList()) { site ->
-                        Button(onClick = { onSiteClicked(site) }) {
-                            Text(site.name)
-                        }
+            }
+            LazyColumn {
+                items(welcomeViewModel.getSiteList()) { site ->
+                    Button(onClick = { onSiteClicked(site) }) {
+                        Text(site.name)
                     }
                 }
             }

native/kotlin/gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 agp = "8.8.1"
 android-compileSdk = "36"
 android-minSdk = "24"
-android-targetSdk = "34"
+android-targetSdk = "36"
 androidx-activityCompose = "1.10.1"
 androidx-core-ktx = "1.16.0"
 androidx-material3 = "1.3.2"
@@ -13,7 +13,7 @@ detekt-plugin = "1.23.8"
 jna = "5.17.0"
 junit = "4.13.2"
 koin = "4.1.0"
-kotlin = "2.0.21"
+kotlin = "2.1.21"
 kotlinx-coroutines = "1.10.2"
 kotlinx-serialization-json = "1.6.3"
 landscapist = "2.5.0"

wordpress.Dockerfile

@@ -33,7 +33,7 @@ ENV PATH="//usr/lib/android-sdk/cmdline-tools/latest/bin:${PATH}"
 RUN yes | sdkmanager --licenses
 
 RUN sdkmanager --install \
-  "ndk;27.0.12077973"
+  "ndk;28.1.13356709"
 
 # Cache Gradle 8.7
 RUN mkdir gradle-cache-tmp \