diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 1a220dc4..9cc0664b 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -15,16 +15,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK 8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: java-version: '8' distribution: 'temurin' - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v6 - name: Build with Gradle run: ./gradlew fatJar - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: APKEditor path: build/libs diff --git a/.github/workflows/gradle_build_beta.yml b/.github/workflows/gradle_build_beta.yml index d8fecad6..3a4e1d56 100644 --- a/.github/workflows/gradle_build_beta.yml +++ b/.github/workflows/gradle_build_beta.yml @@ -15,16 +15,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK 8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: java-version: '8' distribution: 'temurin' - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v6 - name: Build with Gradle run: ./gradlew betaJar - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: APKEditor path: build/libs diff --git a/build.gradle b/build.gradle index cae105fb..b01386d2 100755 --- a/build.gradle +++ b/build.gradle @@ -22,13 +22,13 @@ repositories { dependencies { //implementation("io.github.reandroid:ARSCLib:+") - compile(files("$rootProject.projectDir/libs/ARSCLib.jar")) + implementation(files("$rootProject.projectDir/libs/ARSCLib.jar")) // built from: https://github.com/REAndroid/smali-lib - compile(files("$rootProject.projectDir/libs/smali.jar")) + implementation(files("$rootProject.projectDir/libs/smali.jar")) // built from: https://github.com/REAndroid/JCommand - compile(files("$rootProject.projectDir/libs/JCommand.jar")) + implementation(files("$rootProject.projectDir/libs/JCommand.jar")) } processResources { @@ -52,7 +52,7 @@ task fatJar(type: Jar) { 'Main-Class': 'com.reandroid.apkeditor.Main' ) } - from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } with jar } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8a91a6b6..f1ba1b3d 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-6.5.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.14.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists