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

update rclone and dependencies version. #217

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

update rclone and dependencies version. #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61e327e
build: update go version
feilongfl May 30, 2022
e4a5300
rclone: update rclone to 1.58.1
feilongfl May 30, 2022
663aaf2
build: update gradle to 7.2.1
feilongfl May 30, 2022
57edef5
build: update ndk version
feilongfl May 30, 2022
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
6 changes: 3 additions & 3 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Set up Go 1.16
- name: Set up Go 1.18
uses: actions/setup-go@v1
with:
go-version: 1.16
go-version: 1.18
id: go
- name: Force NDK version
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;22.1.7171670"
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;24.0.8215888"
- name: Build rclone
run: ./gradlew rclone:buildNative
- name: Build app
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
}
}
compileSdkVersion 30
ndkVersion '22.1.7171670'
ndkVersion '24.0.8215888'
defaultConfig {
applicationId 'io.github.x0b.rcx'
minSdkVersion 21
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
maven { url 'https://jitpack.io' }
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:7.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
# Warning: Update checksum when updating gradle, or Android Studio will crash!
distributionSha256Sum=765442b8069c6bee2ea70713861c027587591c6b1df2c857a23361512560894e
distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
8 changes: 4 additions & 4 deletions rclone/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
// - windows x86 (with NDK 21b installed)
//
// Prerequisits:
// - go 1.14 - go 1.16
// - go 1.18
// - ndk

// Rclone version - any git reference (tag, branch, hash) should work
def buildTag = 'v1.55.1'
ext.ndkVersion = '22.1.7171670'
def buildTag = 'v1.58.1'
ext.ndkVersion = '24.0.8215888'

//
// DO NOT EDIT ANYTHING BELOW
Expand Down Expand Up @@ -100,7 +100,7 @@ task fetchRclone(type: Exec) {
mkdir "gopath"
environment 'GOPATH', goPath
environment "GO111MODULE", "on"
commandLine 'go', 'get', '-d', repositoryRef
commandLine 'go', 'install', repositoryRef

ignoreExitValue true
errorOutput = new ByteArrayOutputStream()
Expand Down