Skip to content
Merged
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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ subprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}

task installGitHooks(type: Copy, group: "development") {
tasks.register('installGitHooks', Copy) {
def sourceFolder = "${rootProject.projectDir}/scripts/hooks"
def destFolder = "${rootProject.projectDir}/.git/hooks"

Expand Down
13 changes: 5 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,16 @@ android.nonTransitiveRClass=false
android.nonFinalResIds=false

# JVM arguments to optimize heap usage, enable heap dump on out-of-memory errors, and set the file encoding
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8
org.gradle.dependency.verification.console=verbose
kotlin.daemon.jvmargs=-Xmx4096m
kotlin.daemon.jvmargs=-Xmx3072m
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.configureondemand=true
android.defaults.buildfeatures.resvalues=true
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
android.enableAppCompileTimeRClass=false
android.usesSdkInManifest.disallowed=false
android.uniquePackageNames=false
android.dependency.useConstraints=true
android.r8.strictFullModeForKeepRules=false
android.r8.optimizedResourceShrinking=false
android.builtInKotlin=false
android.newDsl=false

# Enabled parallel sync for Gradle 9.4+
org.gradle.tooling.parallel=true
15 changes: 11 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ plugins {
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'
apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
apply from: "$rootProject.projectDir/jacoco.gradle"
Expand Down Expand Up @@ -162,9 +161,11 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '17'

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}

testOptions {
Expand All @@ -182,6 +183,12 @@ android {
}

namespace = 'com.owncloud.android.lib'

publishing {
singleVariant("release") {
withSourcesJar()
}
}
}

tasks.register("combinedTestReport", JacocoReport) {
Expand Down
6 changes: 6 additions & 0 deletions sample_client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ android {

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

namespace = 'com.owncloud.android.lib.sampleclient'
lint {
abortOnError false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,24 +116,19 @@ public void onDestroy() {


public void onClickHandler(View button) {
switch (button.getId()) {
case R.id.button_refresh:
startRefresh();
break;
case R.id.button_upload:
startUpload();
break;
case R.id.button_delete_remote:
startRemoteDeletion();
break;
case R.id.button_download:
startDownload();
break;
case R.id.button_delete_local:
startLocalDeletion();
break;
default:
Toast.makeText(this, R.string.youre_doing_it_wrong, Toast.LENGTH_SHORT).show();
int id = button.getId();
if (id == R.id.button_refresh) {
startRefresh();
} else if (id == R.id.button_upload) {
startUpload();
} else if (id == R.id.button_delete_remote) {
startRemoteDeletion();
} else if (id == R.id.button_download) {
startDownload();
} else if (id == R.id.button_delete_local) {
startLocalDeletion();
} else {
Toast.makeText(this, R.string.youre_doing_it_wrong, Toast.LENGTH_SHORT).show();
}
}

Expand Down
Loading