Skip to content

Commit

Permalink
chore: 更新项目版本并修改工作流
Browse files Browse the repository at this point in the history
Signed-off-by: xihan123 <[email protected]>
  • Loading branch information
xihan123 committed Jun 12, 2024
1 parent 3e110ec commit 7d4a37a
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 15 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,21 @@ jobs:
distribution: 'temurin'
cache: 'gradle'

- name: Checkout xihan123/YukiHookAPI
uses: actions/checkout@v4
with:
submodules: 'recursive'
fetch-depth: 0
repository: xihan123/YukiHookAPI
path: xihan123/YukiHookAPI

- name: Build dependencies
working-directory: xihan123
run: |
cd YukiHookAPI
chmod +x gradlew
./gradlew publishToMavenLocal
- name: Build with Gradle
run: |
[ $(du -s ~/.gradle/wrapper | awk '{ print $1 }') -gt 250000 ] && rm -rf ~/.gradle/wrapper/* || true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
token: ${{ secrets.RELEASE_TOKEN }}
release-type: node
package-name: release-please-action
release-as: 3.1.6
release-as: 3.1.7
signoff: "xihan123 <[email protected]>"
changelog-types: '[{"type":"types","section":"Types","hidden":false},{"type":"revert","section":"Reverts","hidden":false},{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"improvement","section":"Feature Improvements","hidden":false},{"type":"docs","section":"Docs","hidden":false},{"type":"ci","section":"CI","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":false},{"type":"style","section":"Style","hidden":false},{"type":"refactor","section":"Refactoring","hidden":false},{"type":"perf","section":"Performance Improvements","hidden":false},{"type":"test","section":"Tests","hidden":false},{"type":"build","section":"Build","hidden":false}]'
3 changes: 1 addition & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.kotlinAndroid)
alias(libs.plugins.kotlinSerialization)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.ksp)
alias(libs.plugins.jgit)
alias(libs.plugins.dokka)
Expand Down Expand Up @@ -99,8 +100,6 @@ android {
buildConfig = true
}

composeOptions.kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()

packagingOptions.apply {
resources.excludes += mutableSetOf(
"META-INF/**",
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
alias(libs.plugins.androidLibrary).apply(false)
alias(libs.plugins.kotlinAndroid).apply(false)
alias(libs.plugins.kotlinSerialization).apply(false)
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.ksp).apply(false)
alias(libs.plugins.jgit).apply(false)
alias(libs.plugins.dokka).apply(false)
Expand Down
19 changes: 10 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[versions]
agp = "8.4.0"
kotlin = "1.9.24"
ksp = "1.9.24-1.0.20"
yuki = "1.2.0"
agp = "8.4.2"
kotlin = "2.0.0"
ksp = "2.0.0-1.0.22"
yuki = "1.2.1"
compose-compiler = "1.5.14"
[libraries]
core-ktx = { module = "androidx.core:core-ktx", version = "1.13.1" }
fast-json = { module = "com.alibaba.fastjson2:fastjson2-kotlin", version = "2.0.50" }
fast-json = { module = "com.alibaba.fastjson2:fastjson2-kotlin", version = "2.0.51" }
android-material = { module = "com.google.android.material:material", version = "1.12.0" }
compose-activity = { module = "androidx.activity:activity-compose", version = "1.9.0" }
compose-bom = { module = "dev.chrisbanes.compose:compose-bom", version = "2024.05.00-alpha02" }
compose-bom = { module = "dev.chrisbanes.compose:compose-bom", version = "2024.05.00-alpha03" }
compose-ui = { module = "androidx.compose.ui:ui" }
compose-foundation = { module = "androidx.compose.foundation:foundation" }
compose-runtime = { module = "androidx.compose.runtime:runtime" }
compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
compose-coil = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.7.7" }
compose-lottie = { module = "com.airbnb.android:lottie-compose", version = "6.4.0" }
compose-lottie = { module = "com.airbnb.android:lottie-compose", version = "6.4.1" }
xposed-api = { module = "de.robv.android.xposed:api", version = "82" }
#https://github.com/HighCapable/YukiHookAPI
yukihook-api = { module = "com.highcapable.yukihookapi:api", version.ref = "yuki" }
yukihook-ksp = { module = "com.highcapable.yukihookapi:ksp-xposed", version.ref = "yuki" }
#kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
#https://github.com/LuckyPray/DexKit
dexkit = { module = "org.luckypray:dexkit", version = "2.0.1" }
dexkit = { module = "org.luckypray:dexkit", version = "2.0.2" }
xxpermissions = { module = "com.github.getActivity:XXPermissions", version = "18.63" }
[plugins]
androidApplication = { id = "com.android.application", version.ref = "agp" }
Expand All @@ -32,4 +32,5 @@ kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
jgit = { id = "org.lsposed.lsplugin.jgit", version = "1.1" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jun 20 18:48:48 CST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
9 changes: 7 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,22 @@ dependencyResolutionManagement {
repositories {
google()
mavenCentral()
maven("https://jitpack.io"){
maven("https://jitpack.io") {
content {
includeGroupByRegex("com\\.github.*")
}
}
maven("https://api.xposed.info/"){
maven("https://api.xposed.info/") {
mavenContent {
includeGroup("de.robv.android.xposed")
}
}
maven("https://androidx.dev/storage/compose-compiler/repository/")
mavenLocal {
content {
includeGroupByRegex("com.highcapable.yukihookapi")
}
}
}
}

Expand Down

0 comments on commit 7d4a37a

Please sign in to comment.