Skip to content

Commit e07b049

Browse files
committed
build(deps): update Gradle, AGP, Kotlin and Shadow thru core-gradle module
1 parent b389c13 commit e07b049

File tree

10 files changed

+64
-62
lines changed

10 files changed

+64
-62
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
.externalNativeBuild
1010
.cxx
1111
local.properties
12+
.kotlin

build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ buildscript {
1313
}
1414

1515
dependencies {
16-
classpath("com.android.tools.build:gradle:8.2.0")
16+
classpath("com.android.tools.build:gradle:8.7.3")
1717
// Flixclusive gradle plugin which makes everything work and builds providers
1818
classpath("com.github.flixclusiveorg.core-gradle:core-gradle:1.2.3")
1919
// Kotlin support. Remove if you want to use Java
20-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
20+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
2121
}
2222
}
2323

@@ -68,10 +68,10 @@ subprojects {
6868
val testImplementation by configurations
6969
val coreLibraryDesugaring by configurations
7070

71-
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
71+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
7272

7373
val coreStubsModule = "com.github.flixclusiveorg.core-stubs:provider"
74-
val coreStubsVersion = "1.2.3"
74+
val coreStubsVersion = "1.2.4"
7575

7676
// Stubs for all Flixclusive classes
7777
implementation("$coreStubsModule:$coreStubsVersion")
@@ -86,5 +86,5 @@ subprojects {
8686
}
8787

8888
task<Delete>("clean") {
89-
delete(rootProject.buildDir)
89+
delete(rootProject.layout.buildDirectory)
9090
}

gradle/wrapper/gradle-wrapper.jar

-10.5 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Feb 07 23:54:09 PST 2024
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 30 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 22 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

providers/BasicDummyProvider/build.gradle.kts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@ dependencies {
1818

1919
}
2020

21-
android {
22-
buildFeatures {
23-
compose = true
24-
}
25-
26-
composeOptions {
27-
kotlinCompilerExtensionVersion = "1.5.3"
28-
}
29-
}
30-
3121
/*
3222
* BIG TIP: Just hover on a property and it should provide
3323
* the KDoc/information on what that property does.

providers/BasicDummyProvider/src/main/kotlin/com/flixclusive/provider/basic_dummy_provider/BasicDummyProviderApi.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package com.flixclusive.provider.basic_dummy_provider
22

3-
import com.flixclusive.provider.filter.FilterList
4-
import com.flixclusive.model.provider.link.MediaLink
5-
import com.flixclusive.model.provider.ProviderCatalog
63
import com.flixclusive.model.film.Film
7-
import com.flixclusive.model.film.FilmDetails
84
import com.flixclusive.model.film.FilmMetadata
95
import com.flixclusive.model.film.FilmSearchItem
106
import com.flixclusive.model.film.SearchResponseData
117
import com.flixclusive.model.film.common.tv.Episode
8+
import com.flixclusive.model.provider.ProviderCatalog
9+
import com.flixclusive.model.provider.link.MediaLink
1210
import com.flixclusive.provider.Provider
1311
import com.flixclusive.provider.ProviderApi
12+
import com.flixclusive.provider.filter.FilterList
1413
import okhttp3.OkHttpClient
1514

1615
/**

providers/BasicDummyWebViewProvider/build.gradle.kts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@ dependencies {
1818

1919
}
2020

21-
android {
22-
buildFeatures {
23-
compose = true
24-
}
25-
26-
composeOptions {
27-
kotlinCompilerExtensionVersion = "1.5.3"
28-
}
29-
}
30-
3121
/*
3222
* BIG TIP: Just hover on a property and it should provide
3323
* the KDoc/information on what that property does.

providers/BasicDummyWebViewProvider/src/main/kotlin/com/flixclusive/provider/basic_dummy_webview_provider/BasicDummyWebViewProviderApi.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.flixclusive.provider.basic_dummy_webview_provider
22

33
import android.content.Context
44
import com.flixclusive.model.film.Film
5-
import com.flixclusive.model.film.FilmDetails
65
import com.flixclusive.model.film.FilmMetadata
76
import com.flixclusive.model.film.FilmSearchItem
87
import com.flixclusive.model.film.SearchResponseData

0 commit comments

Comments
 (0)