Skip to content

Commit 8e06c29

Browse files
committed
gradle
1 parent dfb7a76 commit 8e06c29

File tree

6 files changed

+19
-21
lines changed

6 files changed

+19
-21
lines changed

build-logic/convention/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434

3535
// Hack to make the libs accessor work
3636
// https://github.com/gradle/gradle/issues/15383
37-
compileOnly(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
37+
compileOnly(files(libs::class.java.superclass.protectionDomain.codeSource.location))
3838
}
3939

4040
gradlePlugin {

build-logic/convention/src/main/kotlin/Github.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,18 @@ abstract class Github : DefaultTask() {
124124
@get:InputFile
125125
abstract val configurationFile: RegularFileProperty
126126

127+
init {
128+
configurationFile = project.rootProject.file("github.properties")
129+
}
130+
127131
@Input
128132
val properties: Provider<Properties> = configurationFile.map { Properties().apply { load(it.asFile.inputStream()) } }
129133

130134
@Input
131-
val repo: Provider<String?> = properties.map<String?>(PropertyFileTransformer("github_repo"))
135+
val repo: Provider<String> = properties.map(PropertyFileTransformer("github_repo"))
132136

133137
@Input
134-
val token: Provider<String> = properties.map<String?>(PropertyFileTransformer("github_api_key"))
138+
val token: Provider<String> = properties.map(PropertyFileTransformer("github_api_key"))
135139

136140
class PropertyFileTransformer(val key: String) : Transformer<String?, Properties> {
137141
override fun transform(`in`: Properties): String? {

build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,3 @@ plugins {
2424

2525
alias(libs.plugins.buildlogic.github)
2626
}
27-
28-
allprojects {
29-
tasks.withType<Github> {
30-
configurationFile = rootProject.file("github.properties")
31-
}
32-
}

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
22
androidDesugarJdkLibs = "2.1.5"
3-
androidGradlePlugin = "8.10.1"
4-
androidTools = "31.9.0"
3+
androidGradlePlugin = "8.11.1"
4+
androidTools = "31.12.1"
55
androidxAnnotation = "1.9.1"
66
collection = "1.5.0"
77
collectionKtx = "1.5.0"
88
libsu = "6.0.0"
9-
githubApi = "1.321"
10-
hiddenapibypass = "5.0"
9+
githubApi = "1.329"
10+
hiddenapibypass = "6.1"
1111
jebrainsAnnotations = "26.0.2"
12-
kotlin = "2.2.0"
12+
kotlin = "2.2.10"
1313
xposed = "82"
1414
preference = "1.2.1"
1515

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,18 @@ dependencyResolutionManagement {
3939
rootProject.name = "XposedModulets"
4040

4141
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
42+
43+
include(":logger")
44+
include(":reflection")
45+
include(":template")
46+
4247
include(":AlwaysAllowChargingFeedback")
4348
include(":AlwaysAllowMultiInstanceSplit")
4449
include(":AnimationScaleMod")
4550
include(":AntiBrightnessChange")
4651
include(":AutomaticAdvancedSettingsExpander")
47-
include(":BetterAnimationScaling")
48-
include(":BetterVerboseWiFiLogging")
4952
include(":BetterBluetoothDeviceSort")
53+
include(":BetterVerboseWiFiLogging")
5054
include(":ClassHunter")
5155
include(":CodecMod")
5256
include(":DontResetIfBootedAndConnected")
@@ -59,7 +63,3 @@ include(":PreventAudioFocus")
5963
include(":ResetAllNotificationChannels")
6064
include(":RotationControl")
6165
include(":UpsideWifi")
62-
include(":reflection")
63-
include(":logger")
64-
65-
include(":template")

0 commit comments

Comments
 (0)