Fix github actions (#132)

UmairKhalid786 · Nov 10, 2024 · 22f3cae · 22f3cae
1 parent 3d5e25e
commit 22f3cae
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 9 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -19,3 +19,5 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-dontwarn org.slf4j.impl.StaticLoggerBinder
diff --git a/app/src/main/java/com/techlads/composetv/features/home/HomeNestedScreen.kt b/app/src/main/java/com/techlads/composetv/features/home/HomeNestedScreen.kt
@@ -74,14 +74,11 @@ fun HomeNestedScreen(
                                 delay(200)
                                 focusRequester.requestFocus()
                             }
-                        }~Z
+                        }
                     },
                 )
                 .onFocusChanged {
-                    if (it.hasFocus) {
-//                        showCarousel.value = true
-//                        showTopPickDetails.value = false
-                    } else {
+                    if (it.hasFocus.not()) {
                         showCarousel.value = true
                         showTopPickDetails.value = false
                     }

diff --git a/app/src/main/java/com/techlads/composetv/features/home/HomeViewModel.kt b/app/src/main/java/com/techlads/composetv/features/home/HomeViewModel.kt
@@ -7,7 +7,7 @@ import com.techlads.composetv.features.home.leftmenu.model.MenuItem
 import com.techlads.composetv.features.home.network.TmdbApiService
 import com.techlads.composetv.features.home.network.data.Movie
 import com.techlads.composetv.utils.toMutable
-import com.techlads.network.di.ApiResult
+import com.techlads.network.ApiResult
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

diff --git a/app/src/main/java/com/techlads/composetv/features/home/network/TmdbApiService.kt b/app/src/main/java/com/techlads/composetv/features/home/network/TmdbApiService.kt
@@ -1,7 +1,7 @@
 package com.techlads.composetv.features.home.network
 
 import com.techlads.composetv.features.home.network.data.MovieResponse
-import com.techlads.network.di.ApiResult
+import com.techlads.network.ApiResult
 import com.techlads.network.di.safeGet
 import io.ktor.client.HttpClient
 import io.ktor.client.request.header

diff --git a/network/proguard-rules.pro b/network/proguard-rules.pro
@@ -18,4 +18,7 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class com.techlads.network.** { *; }
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/...java/com/techlads/network/di/ApiResult.kt → ...in/java/com/techlads/network/ApiResult.kt b/...java/com/techlads/network/di/ApiResult.kt → ...in/java/com/techlads/network/ApiResult.kt
@@ -1,4 +1,4 @@
-package com.techlads.network.di
+package com.techlads.network
 
 sealed class ApiResult<out T> {
     data class Success<T>(val data: T) : ApiResult<T>()

diff --git a/network/src/main/java/com/techlads/network/di/NetworkModule.kt b/network/src/main/java/com/techlads/network/di/NetworkModule.kt
@@ -1,5 +1,6 @@
 package com.techlads.network.di
 
+import com.techlads.network.ApiResult
 import com.techlads.network.BuildConfig
 import dagger.Module
 import dagger.Provides

diff --git a/utils/.gitignore b/utils/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts
@@ -0,0 +1,10 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.jvm)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}