chore(android): AndroidModel should be enabled only by the env. impl …

…with `kotlin` feature

Signed-off-by: Lachezar Lechev <[email protected]>

src/commonMain/rust/env/env.rs

@@ -86,15 +86,17 @@ impl AndroidEnv {
             load_kotlin_classes(env).expect("kotlin classes load failed");
         *STORAGE.write().expect("STORAGE write failed") =
             Some(Storage::new(env, storage).expect("Create Storage failed"));
-        AndroidEnv::migrate_storage_schema()
-            .and_then(|_| async {
-                let installation_id = get_installation_id().await?;
-                *INSTALLATION_ID
-                    .write()
-                    .expect("INSTALLATION_ID write failed") = Some(installation_id);
-                Ok(())
-            })
-            .boxed_env()
+
+        async {
+            Self::migrate_storage_schema().await?;
+
+            let installation_id = get_installation_id().await?;
+            *INSTALLATION_ID
+                .write()
+                .expect("INSTALLATION_ID write failed") = Some(installation_id);
+            Ok(())
+        }
+        .boxed_env()
     }
     pub fn kotlin_classes<'a>(
     ) -> LockResult<RwLockReadGuard<'a, HashMap<KotlinClassName, GlobalRef>>> {

src/commonMain/rust/model.rs

@@ -1,6 +1,11 @@
+pub use addons::*;
+#[cfg(feature = "kotlin")]
+pub use model::*;
+
 mod addons;
 mod fields;
-pub use addons::*;
 
+#[cfg(feature = "kotlin")]
+// model is only available when the feature is enabled
+// because of the `AndroidEnv` impl
 mod model;
-pub use model::*;