Skip to content

Commit 869e162

Browse files
AntsyLichcuong-tran
authored andcommitted
Address some deprecations
(cherry picked from commit d53a3828b12daead9c898bea12c9a1497d07366f)
1 parent 5c1e103 commit 869e162

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

app/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,10 @@ android {
122122
// Signed, dev build with Android Studio if it's not a debug build
123123
create("dev") {
124124
// Include pseudolocales: https://developer.android.com/guide/topics/resources/pseudolocales
125-
resourceConfigurations.addAll(listOf("en", "en_XA", "ar_XB", "xxhdpi"))
125+
androidResources {
126+
@Suppress("UnstableApiUsage")
127+
localeFilters += listOf("en", "en_XA", "ar_XB", "xxhdpi")
128+
}
126129
dimension = "default"
127130
// Default signing for dev flavor, would be overridden by buildTypes config
128131
signingConfig = signingConfigs.getByName("preview")

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallActivity.kt

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ExtensionInstallActivity : Activity() {
2525
override fun onCreate(savedInstanceState: Bundle?) {
2626
super.onCreate(savedInstanceState)
2727

28+
@Suppress("DEPRECATION")
2829
val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
2930
.setDataAndType(intent.data, intent.type)
3031
.putExtra(Intent.EXTRA_RETURN_RESULT, true)

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

+2
Original file line numberDiff line numberDiff line change
@@ -764,8 +764,10 @@ class ReaderActivity : BaseActivity() {
764764
},
765765
if (isNightMode()) 230 else 242, // 90% dark 95% light
766766
)
767+
@Suppress("DEPRECATION")
767768
window.statusBarColor = toolbarColor
768769
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
770+
@Suppress("DEPRECATION")
769771
window.navigationBarColor = toolbarColor
770772
}
771773

buildSrc/src/main/kotlin/mihon/buildlogic/Commands.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package mihon.buildlogic
22

33
import org.gradle.api.Project
4-
import java.io.ByteArrayOutputStream
54
import java.time.LocalDateTime
65
import java.time.ZoneOffset
76
import java.time.format.DateTimeFormatter
@@ -26,10 +25,11 @@ fun Project.getBuildTime(): String {
2625
}
2726

2827
private fun Project.runCommand(command: String): String {
29-
val byteOut = ByteArrayOutputStream()
30-
exec {
28+
return providers.exec {
3129
commandLine = command.split(" ")
32-
standardOutput = byteOut
3330
}
34-
return String(byteOut.toByteArray()).trim()
31+
.standardOutput
32+
.asText
33+
.get()
34+
.trim()
3535
}

gradle.properties

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ android.nonTransitiveRClass=false
22
android.useAndroidX=true
33

44
kotlin.code.style=official
5-
kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
65
kotlin.mpp.androidSourceSetLayoutVersion=2
76

87
org.gradle.caching=true

0 commit comments

Comments
 (0)