Skip to content

Commit

Permalink
update version and dependencies
Browse files Browse the repository at this point in the history
disable rclone check
update rclone to 1.64.1
  • Loading branch information
newhinton committed Oct 18, 2023
1 parent 10cf2e0 commit e22b6cb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ android {
minSdkVersion 23
compileSdk 34
targetSdkVersion 34
versionCode 290 // last digit is reserved for ABI, only ever end on 0!
versionName '2.3.0'
versionCode 300 // last digit is reserved for ABI, only ever end on 0!
versionName '2.4.0'
resourceConfigurations += ['en', 'de']
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
buildConfigField "java.lang.String", "CLI", System.getenv('RCX_BUILD_CLI') ? System.getenv('RCX_BUILD_CLI') : "\"c03129b6-b09f-9cb4-8fcd-7f143b8f94ef\""
Expand Down Expand Up @@ -147,27 +147,27 @@ dependencies {
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.browser:browser:1.5.0'
implementation 'androidx.browser:browser:1.6.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.3.1'
implementation 'com.github.leinardi:FloatingActionButtonSpeedDial:3.1.1'
implementation 'org.markdownj:markdownj-core:0.4'
implementation 'jp.wasabeef:recyclerview-animators:4.0.2'
implementation 'com.github.GrenderG:Toasty:1.3.0'

implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.android.material:material:1.10.0'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.datastore:datastore-preferences:1.0.0'

implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")


// Thumbnails
implementation 'com.github.bumptech.glide:glide:4.14.2'
implementation 'com.github.bumptech.glide:glide:4.16.0'
implementation 'androidx.work:work-runtime-ktx:2.8.1'
annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2'
annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
// REST Client
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
debugImplementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
// JSON
implementation 'com.fasterxml.jackson.core:jackson-core:2.14.1'
Expand All @@ -184,7 +184,7 @@ dependencies {
implementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.4'
implementation 'net.sourceforge.streamsupport:android-retrofuture:1.7.4'
// App intro
implementation 'com.github.AppIntro:AppIntro:6.1.0'
implementation 'com.github.AppIntro:AppIntro:6.3.1'
// TEST
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.5.2'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx4093M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
android.enableJetifier=false
android.useAndroidX=true
de.felixnuesse.extract.goVersion=1.21.1
de.felixnuesse.extract.rCloneVersion=1.64.0
de.felixnuesse.extract.rCloneVersion=1.64.1
de.felixnuesse.extract.ndkVersion=25.2.9519653
de.felixnuesse.extract.ndkToolchainVersion=33
android.defaults.buildfeatures.buildconfig=true
Expand Down
4 changes: 2 additions & 2 deletions rclone/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,15 @@ task createRcloneModule(type: Exec) {

task checkoutRclone(type: Exec, dependsOn: createRcloneModule) {

def parsedJson = new JsonSlurper().parseText(new URL( 'https://api.github.com/repos/rclone/rclone/releases/latest' ).text)
/*def parsedJson = new JsonSlurper().parseText(new URL( 'https://api.github.com/repos/rclone/rclone/releases/latest' ).text)
def latestRclone = parsedJson.tag_name
if ("v"+RCLONE_VERSION == latestRclone) {
println "You are building the latest version: ${RCLONE_VERSION}"
} else {
logger.error("The latest Rclone version is: ${parsedJson.tag_name}")
logger.error( "You are building: ${RCLONE_VERSION}")
}
}*/

workingDir CACHE_PATH
environment 'GOPATH', GOPATH
Expand Down

0 comments on commit e22b6cb

Please sign in to comment.