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.

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 to 1.61.1 #241

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 13 additions & 20 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
name: Android CI

on:
push:
branches:
- 'dev'
pull_request:
branches-ignore:
- 'dev'
on: [push]

jobs:
build-all:

runs-on: ubuntu-20.04

build:
runs-on: 'ubuntu-22.04'
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: 1.8
- name: Set up Go 1.16
uses: actions/setup-go@v1
distribution: adopt
java-version: '11'
- name: Set up Go 1.19
uses: actions/setup-go@v3
with:
go-version: 1.16
go-version: '1.19'
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;25.2.9519653'
- name: Build rclone
run: ./gradlew rclone:buildNative
- name: Build app
Expand Down Expand Up @@ -59,4 +52,4 @@ jobs:
with:
name: universal.apk
path: app/build/outputs/apk/oss/debug/app-oss-universal-debug.apk
retention-days: 14
retention-days: 180
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
keyAlias 'github_x0b'
}
}
compileSdkVersion 30
ndkVersion '22.1.7171670'
compileSdkVersion 33
ndkVersion '25.2.9519653'
defaultConfig {
applicationId 'io.github.x0b.rcx'
minSdkVersion 21
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
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.4.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#Thu Sep 23 01:27:10 PDT 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
# Warning: Update checksum when updating gradle, or Android Studio will crash!
distributionSha256Sum=765442b8069c6bee2ea70713861c027587591c6b1df2c857a23361512560894e
10 changes: 5 additions & 5 deletions rclone/build.gradle
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.19
// - ndk

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

//
// DO NOT EDIT ANYTHING BELOW
Expand Down Expand Up @@ -100,13 +100,13 @@ 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()
doLast {
if (execResult.getExitValue() != 0) {
throw new GradleException("Error running go get: \n${errorOutput.toString()}")
throw new GradleException("Error running go install: \n${errorOutput.toString()}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion safdav/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 30
compileSdkVersion 33


defaultConfig {
Expand Down