diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9f11eb..ea7e0e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,10 +1,26 @@ name: Build -on: [pull_request, push] + +on: + push: + pull_request: + jobs: build: runs-on: ubuntu-latest + steps: - - name: Checkout the code - uses: actions/checkout@v2 - - name: Build the app - run: ./gradlew driveappfolderviewer:assemble + - name: Checkout + uses: actions/checkout@v4 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: '17' + cache: gradle + + - name: Validate Gradle Wrapper + uses: gradle/actions/wrapper-validation@v4 + + - name: Build + run: ./gradlew build diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml new file mode 100644 index 0000000..0bbda1e --- /dev/null +++ b/.github/workflows/publish-release.yml @@ -0,0 +1,33 @@ +name: Publish Release + +on: + push: + tags: + - '*' + +env: + RELEASE_SIGNING_ENABLED: true + +jobs: + publish: + runs-on: ubuntu-latest + if: github.repository == 'Commit451/DriveAppFolderViewer' + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install JDK + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: '17' + cache: gradle + + - name: Release to Maven Central + run: ./gradlew publishAndReleaseToMavenCentral -PVERSION_NAME="${GITHUB_REF_NAME}" --no-configuration-cache + env: + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }} diff --git a/.jitpack.yml b/.jitpack.yml deleted file mode 100644 index eb996d4..0000000 --- a/.jitpack.yml +++ /dev/null @@ -1,4 +0,0 @@ -jdk: - - openjdk11 -install: - - ./gradlew clean driveappfolderviewer:assemble driveappfolderviewer:publishToMavenLocal \ No newline at end of file diff --git a/README.md b/README.md index ef2ad82..8cd6064 100644 --- a/README.md +++ b/README.md @@ -3,27 +3,16 @@ Allows easy visualization of files within an AppFolder in Google Drive -[![](https://jitpack.io/v/Commit451/DriveAppFolderViewer.svg)](https://jitpack.io/#Commit451/DriveAppFolderViewer) +[![Build](https://github.com/Commit451/DriveAppFolderViewer/actions/workflows/ci.yml/badge.svg)](https://github.com/Commit451/DriveAppFolderViewer/actions/workflows/ci.yml) [![Maven Central](https://img.shields.io/maven-central/v/com.commit451.driveappfolderviewer/driveappfolderviewer.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.commit451.driveappfolderviewer/driveappfolderviewer) ## Dependency -Add this in your root `build.gradle` file (**not** your module `build.gradle` file): - -```gradle -allprojects { - repositories { - ... - maven { url "https://jitpack.io" } - } -} -``` - -Then, add the library to your project `build.gradle` -```gradle +```kotlin dependencies { - debugImplementation 'com.github.Commit451:DriveAppFolderViewer:latest.version.here' - // or, just "implementation" if you want to use this in all your builds + debugImplementation("com.commit451.driveappfolderviewer:driveappfolderviewer:") + // or use implementation(...) if you want it in all builds } ``` + We recommend restricting access to this UI to just debug builds, since it is powerful and users could end up deleting important files without understanding what they do. ## Usage @@ -39,7 +28,7 @@ Note: This library makes no attempt to resolve Google API connection issues, so To contribute to this project and test it with the sample within this repo, you will need to generate your own OAuth 2.0 Client ID following the steps [here](https://developers.google.com/drive/android/get-started) ## Note -- This library is pretty hefty, bringing in Kotlin, Coroutines, okio, and [okyo](https://github.com/Commit451/okyo), as well as the Google Drive v3 Java APIs. Make sure you are aware of this. +- This library is pretty hefty, bringing in Kotlin, Coroutines, and the Google Drive v3 Java APIs. Make sure you are aware of this. - There is a 1,000 page limit on results, therefore only the first 1,000 files/folders will be shown within a folder. License diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index c39597e..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,87 +0,0 @@ -apply plugin: "com.android.application" -apply plugin: "kotlin-android" - - -android { - - project.ext { - KEYSTORE_PASSWORD = project.hasProperty("KEYSTORE_PASSWORD") ? project.KEYSTORE_PASSWORD : " " - } - - compileSdkVersion 32 - - defaultConfig { - applicationId "com.commit451.driveappfolderviewer.sample" - minSdkVersion 21 - targetSdkVersion 32 - versionCode 1 - versionName "1.0" - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - buildFeatures { - compose = true - } - - composeOptions { - kotlinCompilerExtensionVersion = "1.1.1" - } - - packagingOptions { - exclude "META-INF/DEPENDENCIES" - exclude "META-INF/LICENSE" - exclude "META-INF/LICENSE.txt" - exclude "META-INF/license.txt" - exclude "META-INF/NOTICE" - exclude "META-INF/NOTICE.txt" - exclude "META-INF/notice.txt" - exclude "META-INF/ASL2.0" - } - signingConfigs { - release { - storeFile file("keystore.jks") - storePassword project.ext.KEYSTORE_PASSWORD - keyAlias "commit451" - keyPassword project.ext.KEYSTORE_PASSWORD - } - } - buildTypes { - debug { - minifyEnabled false - proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" - signingConfig signingConfigs.release - } - release { - minifyEnabled false - proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" - signingConfig signingConfigs.release - } - } - lintOptions { - abortOnError false - } -} - -dependencies { - implementation "androidx.core:core-ktx:1.7.0" - // Integration with activities - implementation("androidx.activity:activity-compose:1.4.0") - // Compose Material Design - implementation("androidx.compose.material:material:1.1.1") - // Animations - implementation("androidx.compose.animation:animation:1.1.1") - // Tooling support (Previews, etc.) - implementation("androidx.compose.ui:ui-tooling:1.1.1") - // More icons - implementation("androidx.compose.material:material-icons-extended:1.1.1") - implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1" - implementation "androidx.activity:activity-compose:1.4.0" - // need to add this manually to avoid build issues, not actually using it - implementation("com.google.guava:guava:27.0.1-android") - // Integration with ViewModels - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1") - implementation("androidx.compose.runtime:runtime-livedata:1.1.1") - implementation project(":driveappfolderviewer") -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..21952ff --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,81 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.plugin.compose") +} + +android { + namespace = "com.commit451.driveappfolderviewer.sample" + compileSdk = 35 + + defaultConfig { + applicationId = "com.commit451.driveappfolderviewer.sample" + minSdk = 21 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + } + + buildFeatures { + compose = true + } + + composeOptions { + kotlinCompilerExtensionVersion = "1.5.15" + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + buildTypes { + debug { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", + ) + } + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", + ) + } + } + + packaging { + resources { + excludes += setOf( + "META-INF/INDEX.LIST", + "META-INF/DEPENDENCIES", + "META-INF/LICENSE", + "META-INF/LICENSE.txt", + "META-INF/license.txt", + "META-INF/NOTICE", + "META-INF/NOTICE.txt", + "META-INF/notice.txt", + "META-INF/ASL2.0", + ) + } + } + + lint { + abortOnError = false + } +} + +dependencies { + implementation("androidx.core:core-ktx:1.16.0") + implementation("androidx.activity:activity-compose:1.10.1") + implementation("androidx.compose.material:material:1.6.8") + implementation("androidx.compose.animation:animation:1.6.8") + implementation("androidx.compose.ui:ui-tooling:1.6.8") + implementation("androidx.compose.material:material-icons-extended:1.6.8") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1") + implementation("androidx.compose.runtime:runtime-livedata:1.6.8") + + implementation(project(":driveappfolderviewer")) +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f83ba34..f327467 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 23556c9..0000000 --- a/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -buildscript { - ext.kotlin_version = "1.6.10" - ext.compose_version = "1.1.0" - repositories { - google() - mavenCentral() - } - dependencies { - classpath "com.android.tools.build:gradle:7.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.vanniktech:gradle-maven-publish-plugin:0.19.0" - } -} - -plugins { - id "com.github.ben-manes.versions" version "0.42.0" -} - -allprojects { - repositories { - google() - mavenCentral() - maven { url "https://jitpack.io" } - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..f72e250 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + id("com.android.application") version "9.1.0" apply false + id("com.android.library") version "9.1.0" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.3.10" apply false + id("com.vanniktech.maven.publish") version "0.30.0" apply false +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/driveappfolderviewer/build.gradle b/driveappfolderviewer/build.gradle deleted file mode 100644 index ef4f31e..0000000 --- a/driveappfolderviewer/build.gradle +++ /dev/null @@ -1,53 +0,0 @@ -apply plugin: "com.android.library" -apply plugin: "kotlin-android" -apply from: "../publish.gradle" - -android { - compileSdkVersion 32 - - defaultConfig { - minSdkVersion 16 - targetSdkVersion 32 - versionCode 1 - versionName "1.0" - } - buildFeatures { - compose = true - } - composeOptions { - kotlinCompilerExtensionVersion = "1.1.1" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" - } - } - lintOptions { - abortOnError false - } - - resourcePrefix "dafv_" -} - -dependencies { - implementation("androidx.activity:activity-compose:1.4.0") - // Compose Material Design - implementation("androidx.compose.material:material:1.1.1") - - api "androidx.appcompat:appcompat:1.4.1" - api "androidx.recyclerview:recyclerview:1.2.1" - api "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" - api "com.google.android.material:material:1.6.0" - - api "com.google.android.gms:play-services-auth:20.2.0" - api "com.google.http-client:google-http-client-gson:1.26.0" - api("com.google.api-client:google-api-client-android:1.26.0") { - exclude group: "org.apache.httpcomponents" - } - api("com.google.apis:google-api-services-drive:v3-rev136-1.25.0") { - exclude group: "org.apache.httpcomponents" - } - - api "com.github.Commit451:okyo:3.0.2" -} diff --git a/driveappfolderviewer/build.gradle.kts b/driveappfolderviewer/build.gradle.kts new file mode 100644 index 0000000..368dcd6 --- /dev/null +++ b/driveappfolderviewer/build.gradle.kts @@ -0,0 +1,80 @@ +import com.vanniktech.maven.publish.AndroidSingleVariantLibrary +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + id("com.android.library") + id("org.jetbrains.kotlin.plugin.compose") + id("com.vanniktech.maven.publish") +} + +group = findProperty("GROUP") as String +version = findProperty("VERSION_NAME") as String + +android { + namespace = "com.commit451.driveappfolderviewer" + compileSdk = 35 + + defaultConfig { + minSdk = 21 + consumerProguardFiles("consumer-rules.pro") + } + + buildFeatures { + compose = true + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", + ) + } + } + + composeOptions { + kotlinCompilerExtensionVersion = "1.5.15" + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + lint { + abortOnError = false + } + + resourcePrefix = "dafv_" +} + +dependencies { + implementation("androidx.compose.material:material:1.6.8") + implementation("androidx.appcompat:appcompat:1.7.1") + implementation("androidx.recyclerview:recyclerview:1.4.0") + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2") + + api("com.google.android.material:material:1.13.0") + api("com.google.android.gms:play-services-auth:21.4.0") + api("com.google.http-client:google-http-client-android:1.47.0") + api("com.google.http-client:google-http-client-gson:1.47.0") + api("com.google.api-client:google-api-client-android:2.8.0") { + exclude(group = "org.apache.httpcomponents") + } + api("com.google.apis:google-api-services-drive:v3-rev20250511-2.0.0") { + exclude(group = "org.apache.httpcomponents") + } +} + +mavenPublishing { + configure(AndroidSingleVariantLibrary("release", true, true)) + coordinates("com.commit451.driveappfolderviewer", "driveappfolderviewer", version.toString()) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + if (System.getenv("RELEASE_SIGNING_ENABLED") == "true") { + signAllPublications() + } +} diff --git a/driveappfolderviewer/consumer-rules.pro b/driveappfolderviewer/consumer-rules.pro new file mode 100644 index 0000000..97f3ba8 --- /dev/null +++ b/driveappfolderviewer/consumer-rules.pro @@ -0,0 +1 @@ +# Intentionally empty. diff --git a/driveappfolderviewer/proguard-rules.pro b/driveappfolderviewer/proguard-rules.pro new file mode 100644 index 0000000..97f3ba8 --- /dev/null +++ b/driveappfolderviewer/proguard-rules.pro @@ -0,0 +1 @@ +# Intentionally empty. diff --git a/driveappfolderviewer/src/main/AndroidManifest.xml b/driveappfolderviewer/src/main/AndroidManifest.xml index 4be4d05..36509a2 100644 --- a/driveappfolderviewer/src/main/AndroidManifest.xml +++ b/driveappfolderviewer/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/driveappfolderviewer/src/main/java/com/commit451/driveappfolderviewer/DriveAppFileViewModel.kt b/driveappfolderviewer/src/main/java/com/commit451/driveappfolderviewer/DriveAppFileViewModel.kt index a87bcf4..5c05da3 100644 --- a/driveappfolderviewer/src/main/java/com/commit451/driveappfolderviewer/DriveAppFileViewModel.kt +++ b/driveappfolderviewer/src/main/java/com/commit451/driveappfolderviewer/DriveAppFileViewModel.kt @@ -6,7 +6,6 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import com.commit451.okyo.Okyo import com.google.api.services.drive.Drive import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -40,7 +39,7 @@ class DriveAppFileViewModel(application: Application) : AndroidViewModel(applica val inputStream = drive.files().get(fileId) .executeMediaAsInputStream() - val content = Okyo.readInputStreamAsString(inputStream) + val content = inputStream.bufferedReader().use { it.readText() } updateState( _uiState.value?.copy( diff --git a/gradle.properties b/gradle.properties index 2b476f3..55c3e47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,26 +1,10 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -android.enableJetifier=true android.useAndroidX=true -org.gradle.jvmargs=-Xmx1536m - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 GROUP=com.commit451.driveappfolderviewer -VERSION_NAME=0.0.1 +VERSION_NAME=5.0.3 +POM_ARTIFACT_ID=driveappfolderviewer POM_NAME=DriveAppFolderViewer POM_DESCRIPTION=Allows easy visualization of files within an AppFolder in Google Drive POM_INCEPTION_YEAR=2018 @@ -38,4 +22,5 @@ POM_DEVELOPER_ID=Commit451 POM_DEVELOPER_NAME=Commit 451 POM_DEVELOPER_URL=https://github.com/Commit451/ -RELEASE_SIGNING_ENABLED=false \ No newline at end of file +SONATYPE_CONNECT_TIMEOUT_SECONDS=60 +SONATYPE_CLOSE_TIMEOUT_SECONDS=900 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..61285a6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92f06b5..5f38436 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,114 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index a9f778a..e509b2d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -54,49 +57,35 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/publish.gradle b/publish.gradle deleted file mode 100644 index 4a2c1b9..0000000 --- a/publish.gradle +++ /dev/null @@ -1,5 +0,0 @@ -apply plugin: "com.vanniktech.maven.publish" - -mavenPublish { - androidVariantToPublish = "release" -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index f3f475b..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app', ':driveappfolderviewer' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..3806693 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,19 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "DriveAppFolderViewer" + +include(":app", ":driveappfolderviewer")