[go: up one dir, main page]
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.

Sign up for GitHub

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

Jump to bottom

upgrade gradle to 8.10.2; fix deprecation warnings and errors #144

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

upgrade gradle to 8.10.2; fix deprecation warnings and errors #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8eb859
upgrade gradle to 8.10.2; fix deprecation warnings and errors
UlyssesZh Oct 31, 2024
fc202a2
update jdk in github action
UlyssesZh Nov 1, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/gradle_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '8'
java-version: '17'
distribution: 'temurin'
- uses: gradle/actions/setup-gradle@v4
- name: Build with Gradle
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ group 'com.reandroid.apkeditor'
version '1.4.1'

java {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

if (JavaVersion.current().isJava8Compatible()) {
Expand All @@ -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 {
Expand All @@ -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
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
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.10.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading