[issue-17] - common main to android main #18

gabrielbmoro · 2025-02-03T11:16:48Z

Descrição

A ideia desse PR é mover código android específico para o source set do Android + habilitar o iosTarget (mas não implementar ele).

Testes Realizados

Rodar o app

Screen_recording_20250203_081527.webm

Checklist

Os testes foram executados e passaram com sucesso.
As alterações de código seguem as diretrizes de estilo do projeto.
Foram adicionados testes, se aplicável.
Se inscreveu no canal?😛

Issues Relacionadas

ISSUE-17

…modules

gabrielbmoro · 2025-02-03T11:17:23Z

build-logic/src/main/java/extensions/KotlinMultiPlatformExt.kt

+import Config
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+
+fun KotlinMultiplatformExtension.iosTarget() {


Define iosTarget, but not implementing it yet

gabrielbmoro · 2025-02-03T11:17:38Z

composeApp/build.gradle.kts

 kotlin {
    sourceSets {
+        androidMain.dependencies {
+            implementation(libs.koin.android)


Koin android is android specific

gabrielbmoro · 2025-02-03T11:19:03Z

composeApp/build.gradle.kts

    sourceSets {
+        androidMain.dependencies {
+            implementation(libs.koin.android)
+            implementation(libs.lottie)


Lottie is also android specific

gabrielbmoro · 2025-02-03T11:19:22Z

core-local-storage/build.gradle.kts

-        }
-    }

-    listOf(


Let's move this definition to the base conventional plugin

gabrielbmoro · 2025-02-03T11:19:35Z

core-local-storage/build.gradle.kts

-    add("kspIosArm64", libs.room.compiler)
-}
-
-configurations.implementation{


Don't need it anymore

This we need (bringing back):

add("kspIosSimulatorArm64", libs.room.compiler) add("kspIosX64", libs.room.compiler) add("kspIosArm64", libs.room.compiler)

what we don't need is:

configurations.implementation...

gabrielbmoro · 2025-02-03T11:20:00Z

core-networking/build.gradle.kts

@@ -1,35 +1,44 @@
+import com.codingfeline.buildkonfig.compiler.FieldSpec


Adding BuildKonfig to deal with the build config variables in multiplatform world

keep buildtype release, cause is good example how to use

gabrielbmoro · 2025-02-03T11:20:19Z

core-networking/build.gradle.kts

+        }
+
+        androidMain.dependencies {
+            implementation(libs.okhttp)


Android specific network dependencies

gabrielbmoro · 2025-02-03T11:21:50Z

gradle/libs.versions.toml

-networking = ["moshi", "okhttp", "interceptor", "ktor_client_core", "ktor_client_okhttp", "ktor_client_content_serialization_json", "ktor_client_content_negotiation", "ktor_client_logger", "ktor_client_auth"]
-koin = ["koin_android", "koin_compose"]
-
 test = ["junit", "mockk", "mockk_android", "viewmodel_test", "koin_test", "coroutines_test"]


test was the only bundle I kept (the idea is to create an issue to make the unit tests work in the commonTest. Currently they are broken

gabrielbmoro · 2025-02-03T11:23:56Z

.../commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProvider.kt

+
+import io.ktor.client.engine.HttpClientEngine
+
+expect fun httpClientEngine(): HttpClientEngine


Future -> implement httpClientEngine for ios

In the project I work on, I created a pattern that is easier to see

any file that has expect and actual, put it at the end Platform

which is a pattern of understanding that this type of file has this implementation

gabrielbmoro · 2025-02-03T11:24:23Z

...src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/PlayerComponent.kt

-                override fun onReady(youTubePlayer: YouTubePlayer) {
-                    youTubePlayer.loadVideo(videoId, 0f)
-                }
+expect fun PlayerComponent(videoId: String, modifier: Modifier = Modifier)


Future -> implement playerComponent for iOS

rviannaoliveira · 2025-02-03T16:38:54Z

build-logic/src/main/java/Config.kt

-        const val host_release = "\"https://api.themoviedb.org/3/\""
-        const val api_profile_debug = "\"https://demo3364084.mockable.io/\""
-        const val api_profile_release = "\"https://demo3364084.mockable.io/\""
+        const val host = "https://api.themoviedb.org/3/"


I had left it with buildtype more to show how it would work on this and not necessarily because it needs

if you can come back

rviannaoliveira · 2025-02-03T16:39:17Z

build-logic/src/main/java/Config.kt


-        val api_bearer_debug = "\"${System.getenv(tmdb_token_name_debug) ?: bearear_without_environment}\""
-        val api_bearer_release = "\"${System.getenv(tmdb_token_name_release) ?: bearear_without_environment}\""
+        val api_bearer = System.getenv(tmdb_token_name_debug) ?: bearear_without_environment


aqui mesma coisa

rviannaoliveira · 2025-02-03T16:43:12Z

...tlin/com/codandotv/streamplayerapp/core_networking/handleError/HttpClientConfigExtensions.kt

 import io.ktor.utils.io.errors.IOException
 import kotlinx.serialization.SerializationException

-internal fun HttpClientConfig<OkHttpConfig>.validator(


why remove it?

It because this is Moshi (android specific code). Ktor handles this for us.

rviannaoliveira · 2025-02-03T16:44:12Z

...idMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/PlayerComponent.android.kt

+import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.views.YouTubePlayerView
+
+@Composable
+actual fun PlayerComponent(videoId: String, modifier: Modifier) {


I have a suggestions,

In the project I work on, I created a pattern that is easier to see

any file that has expect and actual, put it at the end Platform

which is a pattern of understanding that this type of file has this implementation

rviannaoliveira · 2025-02-03T16:44:43Z

...src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/PlayerComponent.kt

@@ -1,105 +1,10 @@
+@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE")


rviannaoliveira · 2025-02-03T16:45:18Z

...n/kotlin/com/codandotv/streamplayerapp/feature_search/data/model/ListSearchStreamResponse.kt

 @Serializable
 data class ListSearchStreamResponse(
-    @Json(name = "results")
+    @SerialName("results")


tks i forgot

rviannaoliveira · 2025-02-03T16:45:42Z

gradle/libs.versions.toml


 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
+buildkonfig_plugin = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfig" }


make a video about buildKonfig put in kmp trilha pls

Adicionado na planilha

gabrielbmoro · 2025-02-05T19:22:40Z

Future issues to be addressed after this PR

-⁠ ⁠#19

rviannaoliveira · 2025-02-06T18:50:23Z

...king/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/NetworkModule.kt

-            requestTimeoutMillis = TIMEOUT
-            connectTimeoutMillis = TIMEOUT
-        }
+            install(ContentNegotiation) {


não entendi, pq precisou mudar essas coisas

gabrielbmoro added 9 commits February 2, 2025 19:31

Solve local storage module

48d9600

Migrate core-networking to androidMain

9233012

Migrate core-networking to androidMain

89717f7

Migrate core-local-storage to androidMain

881624d

Remove unnecessary annotations + add ktor dependencies to the client …

331540d

…modules

Format build.gradle dependencies

5905ff1

Dependencies cleanup

9eda793

VideoPlayer dependency isolation

aeddeae

Enable iosTarget but not implementing it

48b3de5

gabrielbmoro requested a review from rviannaoliveira February 3, 2025 11:16

gabrielbmoro commented Feb 3, 2025

View reviewed changes

Lottie is also android specific

78783ab

gabrielbmoro commented Feb 3, 2025

View reviewed changes

core-networking/build.gradle.kts

}

androidMain.dependencies {

implementation(libs.okhttp)

Copy link

Author

gabrielbmoro Feb 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Android specific network dependencies

gabrielbmoro commented Feb 3, 2025

View reviewed changes

rviannaoliveira changed the title ~~Feature/issue 17 common main to android main~~ [issue-17 common main to android main Feb 3, 2025

rviannaoliveira changed the title ~~[issue-17 common main to android main~~ [issue-17] - common main to android main Feb 3, 2025

rviannaoliveira reviewed Feb 3, 2025

View reviewed changes

gabrielbmoro added 4 commits February 5, 2025 16:04

Bringing back the build configs variables

45264b7

Bringing back the ksp configuration for iOS

3831391

Add platform suffix to the httpClientEngineProvider

c45120d

Add platform suffix to the Playercomponent

bf70520

gabrielbmoro requested a review from rviannaoliveira February 5, 2025 19:18

rviannaoliveira reviewed Feb 6, 2025

View reviewed changes

rviannaoliveira approved these changes Feb 6, 2025

View reviewed changes

gabrielbmoro merged commit 88d61b0 into master Feb 9, 2025

gabrielbmoro deleted the feature/issue-17-commonMain-to-androidMain branch February 9, 2025 20:29

-                      }
-                  }
-                  listOf(

		@@ -1,35 +1,44 @@
		import com.codingfeline.buildkonfig.compiler.FieldSpec


		import io.ktor.client.engine.HttpClientEngine

		expect fun httpClientEngine(): HttpClientEngine No newline at end of file

		@@ -1,105 +1,10 @@
		@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE")

[issue-17] - common main to android main #18

[issue-17] - common main to android main #18

Uh oh!

Conversation

gabrielbmoro commented Feb 3, 2025

Descrição

Testes Realizados

Checklist

Issues Relacionadas

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rviannaoliveira Feb 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gabrielbmoro commented Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

rviannaoliveira Feb 3, 2025 •

edited

Loading

gabrielbmoro commented Feb 5, 2025 •

edited

Loading