Skip to content

Commit 22f3cae

Browse files
Fix github actions (#132)
1 parent 3d5e25e commit 22f3cae

File tree

9 files changed

+23
-9
lines changed

9 files changed

+23
-9
lines changed

app/proguard-rules.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@
1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
2121
#-renamesourcefileattribute SourceFile
22+
23+
-dontwarn org.slf4j.impl.StaticLoggerBinder

app/src/main/java/com/techlads/composetv/features/home/HomeNestedScreen.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,11 @@ fun HomeNestedScreen(
7474
delay(200)
7575
focusRequester.requestFocus()
7676
}
77-
}~Z
77+
}
7878
},
7979
)
8080
.onFocusChanged {
81-
if (it.hasFocus) {
82-
// showCarousel.value = true
83-
// showTopPickDetails.value = false
84-
} else {
81+
if (it.hasFocus.not()) {
8582
showCarousel.value = true
8683
showTopPickDetails.value = false
8784
}

app/src/main/java/com/techlads/composetv/features/home/HomeViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.techlads.composetv.features.home.leftmenu.model.MenuItem
77
import com.techlads.composetv.features.home.network.TmdbApiService
88
import com.techlads.composetv.features.home.network.data.Movie
99
import com.techlads.composetv.utils.toMutable
10-
import com.techlads.network.di.ApiResult
10+
import com.techlads.network.ApiResult
1111
import dagger.hilt.android.lifecycle.HiltViewModel
1212
import kotlinx.coroutines.flow.MutableStateFlow
1313
import kotlinx.coroutines.flow.StateFlow

app/src/main/java/com/techlads/composetv/features/home/network/TmdbApiService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.techlads.composetv.features.home.network
22

33
import com.techlads.composetv.features.home.network.data.MovieResponse
4-
import com.techlads.network.di.ApiResult
4+
import com.techlads.network.ApiResult
55
import com.techlads.network.di.safeGet
66
import io.ktor.client.HttpClient
77
import io.ktor.client.request.header

network/proguard-rules.pro

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
#-renamesourcefileattribute SourceFile
22+
23+
-keep class com.techlads.network.** { *; }
24+
-dontwarn java.lang.invoke.StringConcatFactory

network/src/main/java/com/techlads/network/di/ApiResult.kt renamed to network/src/main/java/com/techlads/network/ApiResult.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.techlads.network.di
1+
package com.techlads.network
22

33
sealed class ApiResult<out T> {
44
data class Success<T>(val data: T) : ApiResult<T>()

network/src/main/java/com/techlads/network/di/NetworkModule.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.techlads.network.di
22

3+
import com.techlads.network.ApiResult
34
import com.techlads.network.BuildConfig
45
import dagger.Module
56
import dagger.Provides

utils/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

utils/build.gradle.kts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
2+
plugins {
3+
alias(libs.plugins.android.library)
4+
alias(libs.plugins.kotlin.jvm)
5+
}
6+
7+
java {
8+
sourceCompatibility = JavaVersion.VERSION_17
9+
targetCompatibility = JavaVersion.VERSION_17
10+
}

0 commit comments

Comments
 (0)