diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..39c77a1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: +- package-ecosystem: gradle + directory: "/ChBoSync_AndroidStudioProject" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..bbc1b3c --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,30 @@ +name: Build app + +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Gradle cache + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Set up JDK 1.8 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '11' + - name: Setup Android build environment + uses: android-actions/setup-android@v2 + - name: Build + working-directory: ./ChBoSync_AndroidStudioProject + run: ./gradlew build diff --git a/ChBoSync_AndroidStudioProject/.gitignore b/ChBoSync_AndroidStudioProject/.gitignore new file mode 100644 index 0000000..603b140 --- /dev/null +++ b/ChBoSync_AndroidStudioProject/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/ChBoSync_AndroidStudioProject/ChBoSync_AndroidStudioProject.iml b/ChBoSync_AndroidStudioProject/ChBoSync_AndroidStudioProject.iml deleted file mode 100644 index 67b4c51..0000000 --- a/ChBoSync_AndroidStudioProject/ChBoSync_AndroidStudioProject.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ChBoSync_AndroidStudioProject/app/.gitignore b/ChBoSync_AndroidStudioProject/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/ChBoSync_AndroidStudioProject/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/ChBoSync_AndroidStudioProject/app/build.gradle b/ChBoSync_AndroidStudioProject/app/build.gradle index 940d958..d0bb533 100644 --- a/ChBoSync_AndroidStudioProject/app/build.gradle +++ b/ChBoSync_AndroidStudioProject/app/build.gradle @@ -1,12 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 18 - buildToolsVersion "26.0.1" + compileSdkVersion 30 + buildToolsVersion "30.0.3" defaultConfig { applicationId "de.chbosync.android.syncmlclient" minSdkVersion 15 - targetSdkVersion 18 + targetSdkVersion 30 + versionCode 13 + versionName "1.5 (xx 2018)" } buildTypes { @@ -20,10 +22,13 @@ android { // "This may happen particularly when migrating from Eclipse to Android Studio." lintOptions { disable "ResourceType" + abortOnError false } + + useLibrary 'org.apache.http.legacy' } dependencies { - compile 'joda-time:joda-time:1.6.2' - //implementation 'joda-time:joda-time:1.6.2' -} \ No newline at end of file + //compile 'joda-time:joda-time:1.6.2' + implementation 'joda-time:joda-time:2.12.2' +} diff --git a/ChBoSync_AndroidStudioProject/app/src/main/AndroidManifest.xml b/ChBoSync_AndroidStudioProject/app/src/main/AndroidManifest.xml index db359be..5a9fefd 100644 --- a/ChBoSync_AndroidStudioProject/app/src/main/AndroidManifest.xml +++ b/ChBoSync_AndroidStudioProject/app/src/main/AndroidManifest.xml @@ -36,13 +36,7 @@ - - - - + android:installLocation="auto"> diff --git a/ChBoSync_AndroidStudioProject/app/src/main/java/de/chbosync/android/syncmlclient/activities/AndroidDisplayManager.java b/ChBoSync_AndroidStudioProject/app/src/main/java/de/chbosync/android/syncmlclient/activities/AndroidDisplayManager.java index bb3b5cb..3d481f4 100644 --- a/ChBoSync_AndroidStudioProject/app/src/main/java/de/chbosync/android/syncmlclient/activities/AndroidDisplayManager.java +++ b/ChBoSync_AndroidStudioProject/app/src/main/java/de/chbosync/android/syncmlclient/activities/AndroidDisplayManager.java @@ -81,11 +81,11 @@ public class AndroidDisplayManager implements DisplayManager { /** The tag to be written into log messages*/ private static final String TAG = "AndroidDisplayManager"; /** Reference object for the native alert dialogs*/ - private Hashtable holdingDialogs = new Hashtable(); + private final Hashtable holdingDialogs = new Hashtable<>(); /** Reference object for the custom alert dialogs*/ - private Hashtable pendingAlerts = new Hashtable(); + private final Hashtable pendingAlerts = new Hashtable<>(); /** Reference the runnable to be executed after a specific dialog is dismissed*/ - private Hashtable dismissRunnable = new Hashtable(); + private final Hashtable dismissRunnable = new Hashtable<>(); /** References the native alert dialog with a db sequence-like progression*/ private static int incrementalId; /** Holds the last message shown by the showMessage method. Used for test purpose */ @@ -125,7 +125,8 @@ public void showScreen(Screen screen, int screenId) throws Exception { public void showScreen(Context context, int screenId, Bundle extras) throws Exception { Intent intent = null; switch (screenId) { - case Controller.CONFIGURATION_SCREEN_ID: { + case Controller.CONFIGURATION_SCREEN_ID: + case Controller.ADVANCED_SETTINGS_SCREEN_ID: { intent = new Intent(context, AndroidSettingsScreen.class); break; } @@ -137,10 +138,6 @@ public void showScreen(Context context, int screenId, Bundle extras) throws Exce intent = new Intent(context, AndroidAboutScreen.class); break; } - case Controller.ADVANCED_SETTINGS_SCREEN_ID: { - intent = new Intent(context, AndroidSettingsScreen.class); - break; - } case Controller.DEV_SETTINGS_SCREEN_ID: { intent = new Intent(context, AndroidDevSettingsScreen.class); break; @@ -219,8 +216,7 @@ public Dialog createDialog(int id) { AlertDialog.Builder result = (AlertDialog.Builder) dialog; return result.create(); } else if (dialog instanceof Dialog) { - Dialog result = (Dialog) dialog; - return result; + return (Dialog) dialog; } else { if (Log.isLoggable(Log.DEBUG)) { Log.debug(TAG, "Unknown dialog id: " + id); @@ -297,14 +293,14 @@ public void dismissProgressDialog(Screen screen, int id) { public void setProgressDialogMaxValue(int dialogId, int value) { Object dialog = holdingDialogs.get(dialogId); - if(dialog != null && dialog instanceof ProgressDialog) { + if(dialog instanceof ProgressDialog) { ((ProgressDialog)dialog).setMax(value); } } public void setProgressDialogProgressValue(int dialogId, int value) { Object dialog = holdingDialogs.get(dialogId); - if(dialog != null && dialog instanceof ProgressDialog) { + if(dialog instanceof ProgressDialog) { ((ProgressDialog)dialog).setProgress(value); } } @@ -512,9 +508,9 @@ public String readAndResetLastMessage() { */ class NotifyRunnable extends Thread implements Runnable { - private String message; - private int time; - private Activity activity; + private final String message; + private final int time; + private final Activity activity; /** * Constructor @@ -688,8 +684,11 @@ public void showNotification(NotificationData notificationData) { icon = 0; break; } - Notification notification = new Notification(icon, tickerText, when); - notification.flags = Notification.DEFAULT_LIGHTS | Notification.FLAG_AUTO_CANCEL; + Notification.Builder notification = new Notification.Builder(context); + notification.setAutoCancel(true); + notification.setSmallIcon(icon); + notification.setTicker(tickerText); + notification.setWhen(when); CharSequence contentTitle = notificationData.getTitle(); CharSequence contentText = notificationData.getMessage(); @@ -706,10 +705,12 @@ public void showNotification(NotificationData notificationData) { notificationIntent.addCategory("android.intent.category.LAUNCHER"); } PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0); - notification.setLatestEventInfo(context, contentTitle, contentText, contentIntent); + notification.setContentTitle(contentTitle); + notification.setContentText(contentText); + notification.setContentIntent(contentIntent); //finally, launches the notification - notificationManager.notify(notificationData.getId(), notification); + notificationManager.notify(notificationData.getId(), notification.getNotification()); } /** @@ -717,9 +718,9 @@ public void showNotification(NotificationData notificationData) { * listener for the DialogInterface and view. When the click event happens * this listener runs the related Runnable option. */ - private class OnButtonListener implements DialogInterface.OnClickListener, OnClickListener { + private static class OnButtonListener implements DialogInterface.OnClickListener, OnClickListener { - private Runnable action; + private final Runnable action; public OnButtonListener(Runnable action) { this.action = action; diff --git a/ChBoSync_AndroidStudioProject/app/src/main/java/de/chbosync/android/syncmlclient/controller/AndroidHomeScreenController.java b/ChBoSync_AndroidStudioProject/app/src/main/java/de/chbosync/android/syncmlclient/controller/AndroidHomeScreenController.java index f85ef7f..794231e 100644 --- a/ChBoSync_AndroidStudioProject/app/src/main/java/de/chbosync/android/syncmlclient/controller/AndroidHomeScreenController.java +++ b/ChBoSync_AndroidStudioProject/app/src/main/java/de/chbosync/android/syncmlclient/controller/AndroidHomeScreenController.java @@ -74,13 +74,13 @@ public class AndroidHomeScreenController extends HomeScreenController { protected Context context; - private AndroidDisplayManager dm; + private final AndroidDisplayManager dm; private boolean syncAll = false; protected AutoSyncServiceHandler autoSyncServiceHandler; - private NotificationManager notificationManager; + private final NotificationManager notificationManager; public AndroidHomeScreenController(Context context, Controller controller, HomeScreen homeScreen, NetworkStatus networkStatus) { super(controller, homeScreen, networkStatus); @@ -167,7 +167,10 @@ private void showSyncNotification() { long when = System.currentTimeMillis(); - Notification notification = new Notification(icon, tickerText, when); + Notification.Builder notification = new Notification.Builder(context); + notification.setSmallIcon(icon); + notification.setTicker(tickerText); + notification.setWhen(when); CharSequence contentTitle = context.getString(R.string.app_name); CharSequence contentText = context.getString(R.string.notification_sync_in_progress_message); @@ -178,10 +181,14 @@ private void showSyncNotification() { notificationIntent.addCategory("android.intent.category.LAUNCHER"); PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0); - notification.setLatestEventInfo(context, contentTitle, contentText, contentIntent); - - notification.flags = Notification.FLAG_ONGOING_EVENT | Notification.FLAG_NO_CLEAR; - notificationManager.notify(AUTO_SYNC_NOTIFICATION_ID, notification); + notification.setContentTitle(contentTitle); + notification.setContentText(contentText); + notification.setContentIntent(contentIntent); + + notification.setOngoing(true); + Notification n = notification.getNotification(); + n.flags |= Notification.FLAG_NO_CLEAR; + notificationManager.notify(AUTO_SYNC_NOTIFICATION_ID, n); } private void hideSyncNotification() { @@ -244,11 +251,7 @@ public void syncAllSources(String syncMode, int retryCount) { } public boolean isFirstSyncDialogDisplayed() { - if (dm.isAlertPending(DisplayManager.FIRST_SYNC_DIALOG_ID)) { - return true; - } else { - return false; - } + return dm.isAlertPending(DisplayManager.FIRST_SYNC_DIALOG_ID); } public boolean getSyncAll() { @@ -320,7 +323,7 @@ public synchronized void continueSynchronizationAfterFirstSyncDialog(String sync super.continueSynchronizationAfterFirstSyncDialog(syncType, filteredSources, refresh, direction, delay, fromOutside, continueSyncFromDialog); } else { - AppSyncSource first = (AppSyncSource)filteredSources.get(0); + AppSyncSource first = filteredSources.get(0); if(filteredSources.size() > 1) { this.syncAll = true; } diff --git a/ChBoSync_AndroidStudioProject/app/src/main/res/values/strings.xml b/ChBoSync_AndroidStudioProject/app/src/main/res/values/strings.xml index 6924bff..4043b62 100644 --- a/ChBoSync_AndroidStudioProject/app/src/main/res/values/strings.xml +++ b/ChBoSync_AndroidStudioProject/app/src/main/res/values/strings.xml @@ -315,4 +315,7 @@ Tasquid Permission create new tasks, edit existing tasks + + Preferences for synchronization + Synchronization preference diff --git a/ChBoSync_AndroidStudioProject/build.gradle b/ChBoSync_AndroidStudioProject/build.gradle index ba7d3bb..249b84f 100644 --- a/ChBoSync_AndroidStudioProject/build.gradle +++ b/ChBoSync_AndroidStudioProject/build.gradle @@ -2,18 +2,24 @@ buildscript { repositories { - jcenter() + gradlePluginPortal() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:7.0.4' } } allprojects { repositories { - jcenter() + gradlePluginPortal() + google() } } dependencies { } + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/ChBoSync_AndroidStudioProject/gradle.properties b/ChBoSync_AndroidStudioProject/gradle.properties new file mode 100644 index 0000000..47a56de --- /dev/null +++ b/ChBoSync_AndroidStudioProject/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536m +android.useAndroidX=true +android.enableJetifier=true diff --git a/ChBoSync_AndroidStudioProject/gradle/wrapper/gradle-wrapper.jar b/ChBoSync_AndroidStudioProject/gradle/wrapper/gradle-wrapper.jar index 13372ae..62d4c05 100644 Binary files a/ChBoSync_AndroidStudioProject/gradle/wrapper/gradle-wrapper.jar and b/ChBoSync_AndroidStudioProject/gradle/wrapper/gradle-wrapper.jar differ diff --git a/ChBoSync_AndroidStudioProject/gradle/wrapper/gradle-wrapper.properties b/ChBoSync_AndroidStudioProject/gradle/wrapper/gradle-wrapper.properties index 18692b8..29e4134 100644 --- a/ChBoSync_AndroidStudioProject/gradle/wrapper/gradle-wrapper.properties +++ b/ChBoSync_AndroidStudioProject/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Sep 03 20:43:08 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/ChBoSync_AndroidStudioProject/gradlew b/ChBoSync_AndroidStudioProject/gradlew old mode 100644 new mode 100755 index 9d82f78..fbd7c51 --- a/ChBoSync_AndroidStudioProject/gradlew +++ b/ChBoSync_AndroidStudioProject/gradlew @@ -1,4 +1,20 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## ## @@ -6,20 +22,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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 +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"' + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +64,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,28 +75,14 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# 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 -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - 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 @@ -85,7 +106,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +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 @@ -105,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# 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 @@ -134,27 +156,30 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` 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" ;; + 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 -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +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" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/ChBoSync_AndroidStudioProject/gradlew.bat b/ChBoSync_AndroidStudioProject/gradlew.bat index 8a0b282..5093609 100644 --- a/ChBoSync_AndroidStudioProject/gradlew.bat +++ b/ChBoSync_AndroidStudioProject/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,14 +24,17 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +65,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,17 +78,13 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -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% diff --git a/ChBoSync_AndroidStudioProject/settings.gradle b/ChBoSync_AndroidStudioProject/settings.gradle index e7b4def..e310277 100644 --- a/ChBoSync_AndroidStudioProject/settings.gradle +++ b/ChBoSync_AndroidStudioProject/settings.gradle @@ -1 +1,2 @@ +rootProject.name='ChBo-SyncML' include ':app'