Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update target sdk to 35 (android 15), gradle & exoplayer #1434

Merged
merged 2 commits into from
Dec 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions app/CMakeLists.txt

This file was deleted.

26 changes: 7 additions & 19 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@ android {
enable = true
}

/* disable this for now
externalNativeBuild {
cmake {
path("CMakeLists.txt")
}
}*/

signingConfigs {
if (prereleaseStoreFile != null) {
create("prerelease") {
Expand All @@ -49,16 +42,16 @@ android {
}
}

compileSdk = 34
buildToolsVersion = "34.0.0"
compileSdk = 35
// buildToolsVersion = "34.0.0"

defaultConfig {
applicationId = "com.lagradost.cloudstream3"
minSdk = 21
targetSdk = 33 /* Android 14 is Fu*ked
targetSdk = 35 /* Android 14 is Fu*ked
^ https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading*/
versionCode = 64
versionName = "4.4.1"
versionName = "4.4.2"

resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
Expand Down Expand Up @@ -154,12 +147,7 @@ dependencies {
androidTestImplementation(libs.espresso.core)

// Android Core & Lifecycle
implementation(libs.core.ktx) {
version {
strictly("1.13.1")
}
because("Need SDK 35 and AGP 8.2 for 1.15")
}
implementation(libs.core.ktx)
implementation(libs.appcompat)
implementation(libs.navigation.ui.ktx)
implementation(libs.lifecycle.livedata.ktx)
Expand Down Expand Up @@ -218,8 +206,8 @@ dependencies {
implementation(libs.aria2cstream)

// Downloading & Networking
implementation(libs.work.runtime) // need sdk 35 and agp 8.2 for 1.15
implementation(libs.work.runtime.ktx) // need sdk 35 and agp 8.2 for 1.15
implementation(libs.work.runtime)
implementation(libs.work.runtime.ktx)
implementation(libs.nicehttp) // HTTP Lib

implementation(project(":library") {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:targetApi="tiramisu">
tools:targetApi="35">

<meta-data
android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
Expand Down
14 changes: 5 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.2.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
classpath(libs.gradle)
classpath(libs.jetbrains.kotlin.gradle.plugin)
classpath(libs.dokka.gradle.plugin)
// Universal build config
classpath("com.codingfeline.buildkonfig:buildkonfig-gradle-plugin:0.15.1")
classpath(libs.buildkonfig.gradle.plugin)
}
}

Expand All @@ -20,8 +20,4 @@ allprojects {
mavenLocal()
maven("https://jitpack.io")
}
}

//tasks.register<Delete>("clean") {
// delete(rootProject.layout.buildDirectory)
//}
}
28 changes: 18 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,35 @@ appcompat = "1.7.0"
aria2cstream = "0.0.6"
autoServiceKsp = "1.2.0"
biometric = "1.2.0-alpha05"
coil = "3.0.3"
buildkonfigGradlePlugin = "0.15.1"
coil = "3.0.4"
colorpicker = "1.1.0"
conscryptAndroid = "2.5.2"
constraintlayout = "2.2.0"
coreKtx = "1.13.1"
desugar_jdk_libs_nio = "2.1.2"
coreKtx = "1.15.0"
desugar_jdk_libs_nio = "2.1.4"
dokkaGradlePlugin = "1.9.10"
espressoCore = "3.6.1"
fuzzywuzzy = "1.4.0"
glide = "4.16.0"
glideTransformations = "4.3.0"
guava = "33.2.1-android"
gradle = "8.2.2"
guava = "33.3.1-android"
jacksonModuleKotlin = "2.13.1"
json = "20240303"
junit = "4.13.2"
junitKtx = "1.2.1"
junitVersion = "1.2.1"
juniversalchardet = "2.5.0"
kotlinxCoroutinesCore = "1.8.0"
kotlinGradlePluginVersion = "1.9.23"
kotlinxCoroutinesCore = "1.9.0"
lifecycleLivedataKtx = "2.8.7"
lifecycleViewmodelKtx = "2.8.7"
material = "1.12.0"
media3 = "1.4.1"
media3 = "1.5.1"
mediaFfmpeg = "1.1.0"
navigationFragmentKtx = "2.8.3"
navigationUiKtx = "2.8.3"
navigationFragmentKtx = "2.8.5"
navigationUiKtx = "2.8.5"
newpipeextractor = "v0.24.3"
nicehttp = "0.4.11"
okhttp3Integration = "4.16.0"
Expand All @@ -44,8 +48,8 @@ swiperefreshlayout = "1.1.0"
tmdbJava = "2.11.0"
tvprovider = "1.0.0"
video = "1.0.0"
workRuntime = "2.9.1"
workRuntimeKtx = "2.9.1"
workRuntime = "2.10.0"
workRuntimeKtx = "2.10.0"

[libraries]
acra-core = { module = "ch.acra:acra-core", version.ref = "acraCore" }
Expand All @@ -54,6 +58,7 @@ appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat"
aria2cstream = { module = "com.github.recloudstream:Aria2cStream", version.ref = "aria2cstream" }
auto-service-ksp = { module = "dev.zacsweers.autoservice:auto-service-ksp", version.ref = "autoServiceKsp" }
biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
buildkonfig-gradle-plugin = { module = "com.codingfeline.buildkonfig:buildkonfig-gradle-plugin", version.ref = "buildkonfigGradlePlugin" }
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
colorpicker = { module = "com.jaredrummler:colorpicker", version.ref = "colorpicker" }
Expand All @@ -62,13 +67,16 @@ constraintlayout = { module = "androidx.constraintlayout:constraintlayout", vers
core = { module = "androidx.test:core" }
core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs_nio" }
dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokkaGradlePlugin" }
espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
ext-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
fuzzywuzzy = { module = "me.xdrop:fuzzywuzzy", version.ref = "fuzzywuzzy" }
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
glide-transformations = { module = "jp.wasabeef:glide-transformations", version.ref = "glideTransformations" }
gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jacksonModuleKotlin" }
jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePluginVersion" }
json = { module = "org.json:json", version.ref = "json" }
junit = { module = "junit:junit", version.ref = "junit" }
junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
Expand Down
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri Apr 30 17:11:15 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStoreBase=GRADLE_USER_HOME
Loading