From 58980c494ec0f5ddedb7d69789dad8460e05d3e9 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sat, 30 Apr 2016 20:17:07 +0200 Subject: [PATCH] updated libs added library management changed some edittext to the right class --- app/build.gradle | 29 ++++++----- .../com/idlegandalf/ledd/ColorActivity.java | 51 ++++++++++--------- ...allback.java => ReceiveColorCallback.java} | 6 +-- .../ledd/components/LedStripe.java | 14 ++--- .../ledd/fragments/AddControllerDialog.java | 14 ++--- .../ledd/fragments/AddDaemonDialog.java | 8 +-- .../ledd/fragments/AddProfileDialog.java | 8 +-- .../ledd/fragments/AddStripeDialog.java | 32 ++++++------ .../idlegandalf/ledd/helper/LedDHelper.java | 12 ++--- .../res/layout/fragment_addcontroller.xml | 6 +-- .../main/res/layout/fragment_adddaemon.xml | 2 +- .../main/res/layout/fragment_addprofile.xml | 35 ++++++------- .../res/layout/fragment_addprofile_item.xml | 3 +- .../main/res/layout/fragment_addstripe.xml | 8 +-- build.gradle | 9 +--- gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 10 ++-- 17 files changed, 122 insertions(+), 129 deletions(-) rename app/src/main/java/com/idlegandalf/ledd/callbacks/{RecieveColorCallback.java => ReceiveColorCallback.java} (83%) mode change 100644 => 100755 gradlew diff --git a/app/build.gradle b/app/build.gradle index 82f1d98..622889d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,26 +24,30 @@ buildscript { flatDir { dirs 'libs' } + + maven { url "https://jitpack.io" } } dependencies { classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1' classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0' + classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.github.JakeWharton:sdk-manager-plugin:master' } } +apply plugin: 'android-sdk-manager' apply plugin: 'com.android.application' apply plugin: 'com.jakewharton.hugo' apply plugin: 'com.github.ben-manes.versions' +apply plugin: 'com.neenbedankt.android-apt' android { compileSdkVersion 23 - buildToolsVersion '23.0.2' - + buildToolsVersion '23.0.3' lintOptions { abortOnError false } - defaultConfig { applicationId "com.idlegandalf.ledd" minSdkVersion 18 @@ -57,26 +61,27 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } - - debug { - zipAlignEnabled true - } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 } } dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:23.2.1' - compile 'com.android.support:support-v4:23.2.1' + compile 'com.android.support:appcompat-v7:23.3.0' + compile 'com.android.support:support-v4:23.3.0' compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.google.code.gson:gson:2.6.2' - compile 'com.jakewharton:butterknife:7.0.1' + compile 'com.jakewharton:butterknife:8.0.1' + apt 'com.jakewharton:butterknife-compiler:8.0.1' compile 'com.koushikdutta.async:androidasync:2.1.7' - compile 'com.android.support:design:23.2.1' + compile 'com.android.support:design:23.3.0' compile 'com.larswerkman:HoloColorPicker:1.5@aar' compile 'com.google.guava:guava:19.0' compile 'com.thetransactioncompany:jsonrpc2-base:1.38' - compile('com.mikepenz:materialdrawer:5.1.5@aar') { + compile('com.mikepenz:materialdrawer:5.2.2@aar') { transitive = true } provided 'org.projectlombok:lombok:1.16.8' diff --git a/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java b/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java index 2c2f4d4..0186102 100644 --- a/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java +++ b/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java @@ -41,7 +41,7 @@ import android.widget.LinearLayout; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; -import com.idlegandalf.ledd.callbacks.RecieveColorCallback; +import com.idlegandalf.ledd.callbacks.ReceiveColorCallback; import com.idlegandalf.ledd.callbacks.StripesCallback; import com.idlegandalf.ledd.components.HSV; import com.idlegandalf.ledd.components.LedDDaemon; @@ -62,27 +62,28 @@ import com.mikepenz.materialdrawer.model.DividerDrawerItem; import com.mikepenz.materialdrawer.model.PrimaryDrawerItem; import com.mikepenz.materialdrawer.model.SecondaryDrawerItem; import com.mikepenz.materialdrawer.model.SecondarySwitchDrawerItem; +import com.mikepenz.materialdrawer.model.SwitchDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import hugo.weaving.DebugLog; public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerItemClickListener, Drawer.OnDrawerItemLongClickListener, OnCheckedChangeListener { - @Bind(R.id.main_layout) + @BindView(R.id.main_layout) LinearLayout scrollView; - @Bind(R.id.toolbar) + @BindView(R.id.toolbar) Toolbar toolbar; - @Bind(R.id.picker) + @BindView(R.id.picker) ColorPicker colorPicker; - @Bind(R.id.saturationbar) + @BindView(R.id.saturationbar) SaturationBar saturationBar; - @Bind(R.id.valuebar) + @BindView(R.id.valuebar) ValueBar valueBar; Drawer mDrawer; private List mDaemons; @@ -152,7 +153,7 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI menuProfiles.withSubItems(new SecondaryDrawerItem().withName("Add Profile").withTag("add_profile").withSelectable(false).withIcon(R.drawable.ic_add_circle_outline_black_48dp)); - // enable Homebutton navigation to drawer + // enable HomeButton navigation to drawer if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(false); mDrawer.getActionBarDrawerToggle().setDrawerIndicatorEnabled(true); @@ -384,7 +385,7 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI List mStripes = new ArrayList<>(); for (LedStripe stripe : ledStripes) { - final SecondarySwitchDrawerItem sItem = new SecondarySwitchDrawerItem() + final SwitchDrawerItem sItem = new SecondarySwitchDrawerItem() .withName(stripe.getName()) .withTag(stripe.getId()) .withIcon(R.drawable.ic_wb_iridescent_black_48dp) @@ -410,14 +411,14 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI }); for (LedStripe stripe : ledStripes) { - stripe.getColor(new RecieveColorCallback() { + stripe.getColor(new ReceiveColorCallback() { @Override public void onConnectionFailed(String message) { } @Override - public void onColorRecieved(LedStripe stripe) { + public void onColorReceived(LedStripe stripe) { if (stripe.isOn()) { IDrawerItem sItem = findItemForStripe(stripe); @@ -436,7 +437,7 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI } @Override - public void onRecievFailed(int code, String msg) { + public void onReceiveFailed(int code, String msg) { } @@ -473,9 +474,9 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI toolbar.setTitle(stripe.getName()); autoColorSet = true; mDrawer.closeDrawer(); - mCurrentStripe.getColor(new RecieveColorCallback() { + mCurrentStripe.getColor(new ReceiveColorCallback() { @Override - public void onColorRecieved(final LedStripe stripe) { + public void onColorReceived(final LedStripe stripe) { final HSV cColor = stripe.getColor(); final int color = Color.HSVToColor(new float[]{(float) cColor.getHue(), (float) cColor.getSaturation(), (float) cColor.getValue()}); @@ -496,7 +497,7 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI } @Override - public void onRecievFailed(int code, String msg) { + public void onReceiveFailed(int code, String msg) { autoColorSet = false; } @@ -507,16 +508,6 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI }); } - protected class refreshDaemonsListener extends BroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(ColorApplication.INTENT_ACTION_REFRESH)) { - refreshStripes(); - } - } - } - @Nullable @DebugLog private IDrawerItem findItemForStripe(LedStripe stripe) { @@ -532,4 +523,14 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI return null; } + + protected class refreshDaemonsListener extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + if (intent.getAction().equals(ColorApplication.INTENT_ACTION_REFRESH)) { + refreshStripes(); + } + } + } } diff --git a/app/src/main/java/com/idlegandalf/ledd/callbacks/RecieveColorCallback.java b/app/src/main/java/com/idlegandalf/ledd/callbacks/ReceiveColorCallback.java similarity index 83% rename from app/src/main/java/com/idlegandalf/ledd/callbacks/RecieveColorCallback.java rename to app/src/main/java/com/idlegandalf/ledd/callbacks/ReceiveColorCallback.java index 8e32116..98d8880 100644 --- a/app/src/main/java/com/idlegandalf/ledd/callbacks/RecieveColorCallback.java +++ b/app/src/main/java/com/idlegandalf/ledd/callbacks/ReceiveColorCallback.java @@ -20,8 +20,8 @@ package com.idlegandalf.ledd.callbacks; import com.idlegandalf.ledd.components.LedStripe; -public interface RecieveColorCallback extends BaseCallback { - void onColorRecieved(LedStripe stripe); +public interface ReceiveColorCallback extends BaseCallback { + void onColorReceived(LedStripe stripe); - void onRecievFailed(int code, String msg); + void onReceiveFailed(int code, String msg); } diff --git a/app/src/main/java/com/idlegandalf/ledd/components/LedStripe.java b/app/src/main/java/com/idlegandalf/ledd/components/LedStripe.java index b14117d..7fee2e3 100644 --- a/app/src/main/java/com/idlegandalf/ledd/components/LedStripe.java +++ b/app/src/main/java/com/idlegandalf/ledd/components/LedStripe.java @@ -22,7 +22,7 @@ import android.graphics.Color; import android.support.annotation.Nullable; import com.idlegandalf.ledd.ColorApplication; -import com.idlegandalf.ledd.callbacks.RecieveColorCallback; +import com.idlegandalf.ledd.callbacks.ReceiveColorCallback; import com.idlegandalf.ledd.helper.LedDHelper; import hugo.weaving.DebugLog; @@ -91,20 +91,20 @@ public class LedStripe { } @DebugLog - public void getColor(@Nullable final RecieveColorCallback callback) { + public void getColor(@Nullable final ReceiveColorCallback callback) { checkHelper(); - helper.getColor(this, new RecieveColorCallback() { + helper.getColor(this, new ReceiveColorCallback() { @Override - public void onColorRecieved(LedStripe stripe) { + public void onColorReceived(LedStripe stripe) { color = stripe.getColor(); if (callback != null) - callback.onColorRecieved(LedStripe.this); + callback.onColorReceived(LedStripe.this); } @Override - public void onRecievFailed(int code, String msg) { - if (callback != null) callback.onRecievFailed(code, msg); + public void onReceiveFailed(int code, String msg) { + if (callback != null) callback.onReceiveFailed(code, msg); } @Override diff --git a/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java b/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java index eda28dd..bdbab29 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java @@ -42,22 +42,22 @@ import com.idlegandalf.ledd.helper.LedDHelper; import java.text.NumberFormat; import java.text.ParsePosition; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; public class AddControllerDialog extends DialogFragment implements DialogInterface.OnShowListener { - @Bind(R.id.input_i2c_layout) + @BindView(R.id.input_i2c_layout) TextInputLayout i2cLayout; - @Bind(R.id.input_i2c) + @BindView(R.id.input_i2c) EditText i2cText; - @Bind(R.id.input_address_layout) + @BindView(R.id.input_address_layout) TextInputLayout addressLayout; - @Bind(R.id.input_address) + @BindView(R.id.input_address) EditText addressText; - @Bind(R.id.input_channel_layout) + @BindView(R.id.input_channel_layout) TextInputLayout channelLayout; - @Bind(R.id.input_channel) + @BindView(R.id.input_channel) EditText channelText; LedDDaemon dDaemon; diff --git a/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java b/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java index 77bd07a..87cff29 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java @@ -49,18 +49,18 @@ import java.net.Inet4Address; import java.util.ArrayList; import java.util.List; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; public class AddDaemonDialog extends DialogFragment implements DialogInterface.OnShowListener, NsdManager.DiscoveryListener { private final String SERVICE_TYPE = "_ledd._tcp."; - @Bind(R.id.input_ip) + @BindView(R.id.input_ip) EditText ip; - @Bind(R.id.input_ip_layout) + @BindView(R.id.input_ip_layout) TextInputLayout ip_lay; - @Bind(R.id.host_container) + @BindView(R.id.host_container) LinearLayout hostContainer; List ledDDaemons = new ArrayList<>(); NsdManager mNsdManager; diff --git a/app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java b/app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java index 55ba864..9daaa56 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java @@ -40,18 +40,18 @@ import com.idlegandalf.ledd.components.Profile; import java.util.ArrayList; import java.util.List; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import hugo.weaving.DebugLog; public class AddProfileDialog extends DialogFragment implements DialogInterface.OnShowListener { - @Bind(R.id.input_profile_name_layout) + @BindView(R.id.input_profile_name_layout) TextInputLayout nameLayout; - @Bind(R.id.input_profile_name) + @BindView(R.id.input_profile_name) EditText nameText; - @Bind(R.id.container_linlay) + @BindView(R.id.container_linlay) LinearLayout checkboxContainer; List mStripes; List mCheckboxes; diff --git a/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java b/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java index 4a41ae7..cd7d8b9 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java @@ -54,42 +54,42 @@ import java.text.NumberFormat; import java.text.ParsePosition; import java.util.List; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; public class AddStripeDialog extends DialogFragment implements DialogInterface.OnShowListener { public static AddStripeDialog instance; - @Bind(R.id.spinner_daemon) + @BindView(R.id.spinner_daemon) Spinner daemonSpinner; - @Bind(R.id.spinner_controller) + @BindView(R.id.spinner_controller) Spinner controllerSpinner; - @Bind(R.id.choose_controller_lay) + @BindView(R.id.choose_controller_lay) RelativeLayout controllerLayout; - @Bind(R.id.input_stripe_name_lay) + @BindView(R.id.input_stripe_name_lay) TextInputLayout stripeNameLay; - @Bind(R.id.input_stripe_name) + @BindView(R.id.input_stripe_name) EditText stripeNameText; - @Bind(R.id.input_channel_r_lay) + @BindView(R.id.input_channel_r_lay) TextInputLayout channelRLay; - @Bind(R.id.input_channel_r) + @BindView(R.id.input_channel_r) EditText channelR; - @Bind(R.id.input_channel_g_lay) + @BindView(R.id.input_channel_g_lay) TextInputLayout channelGLay; - @Bind(R.id.input_channel_g) + @BindView(R.id.input_channel_g) EditText channelG; - @Bind(R.id.input_channel_b_lay) + @BindView(R.id.input_channel_b_lay) TextInputLayout channelBLay; - @Bind(R.id.input_channel_b) + @BindView(R.id.input_channel_b) EditText channelB; - @Bind(R.id.stripe_mapping_lay) + @BindView(R.id.stripe_mapping_lay) LinearLayout stripeMapping; - @Bind(R.id.imgbuttn_togglechannel_r) + @BindView(R.id.imgbuttn_togglechannel_r) ImageButton channelRBttn; - @Bind(R.id.imgbuttn_togglechannel_g) + @BindView(R.id.imgbuttn_togglechannel_g) ImageButton channelGBttn; - @Bind(R.id.imgbuttn_togglechannel_b) + @BindView(R.id.imgbuttn_togglechannel_b) ImageButton channelBBttn; ArrayAdapter daemonArrayAdapter; ArrayAdapter controllerArrayAdapter; diff --git a/app/src/main/java/com/idlegandalf/ledd/helper/LedDHelper.java b/app/src/main/java/com/idlegandalf/ledd/helper/LedDHelper.java index 1ea74c3..ab1cf0e 100644 --- a/app/src/main/java/com/idlegandalf/ledd/helper/LedDHelper.java +++ b/app/src/main/java/com/idlegandalf/ledd/helper/LedDHelper.java @@ -29,7 +29,7 @@ import com.idlegandalf.ledd.ColorApplication; import com.idlegandalf.ledd.callbacks.AddControllerCallback; import com.idlegandalf.ledd.callbacks.AddStripeCallback; import com.idlegandalf.ledd.callbacks.DiscoverCallback; -import com.idlegandalf.ledd.callbacks.RecieveColorCallback; +import com.idlegandalf.ledd.callbacks.ReceiveColorCallback; import com.idlegandalf.ledd.callbacks.StripesCallback; import com.idlegandalf.ledd.components.AnswerTask; import com.idlegandalf.ledd.components.Controller; @@ -215,7 +215,7 @@ public class LedDHelper { * * @param ledStripe Stripe */ - public void getColor(final LedStripe ledStripe, final RecieveColorCallback callback) { + public void getColor(final LedStripe ledStripe, final ReceiveColorCallback callback) { HashMap params = new HashMap<>(); params.put("sid", ledStripe.getId()); @@ -234,17 +234,17 @@ public class LedDHelper { if (hsv.length() == 3) { System.out.println(hsv); ledStripe.setColor(new HSV(hsv.getDouble(0), hsv.getDouble(1), hsv.getDouble(2))); - callback.onColorRecieved(ledStripe); + callback.onColorReceived(ledStripe); } else { - callback.onRecievFailed(-1, "HSV was empty"); + callback.onReceiveFailed(-1, "HSV was empty"); } } catch (JSONException e) { e.printStackTrace(); - callback.onRecievFailed(-1, "Unhandeled JSON Exception"); + callback.onReceiveFailed(-1, "Unhandeled JSON Exception"); } } else { @SuppressWarnings("ThrowableResultOfMethodCallIgnored") JSONRPC2Error error = response.getError(); - callback.onRecievFailed(error.getCode(), error.getMessage()); + callback.onReceiveFailed(error.getCode(), error.getMessage()); } } }); diff --git a/app/src/main/res/layout/fragment_addcontroller.xml b/app/src/main/res/layout/fragment_addcontroller.xml index f7474a0..48b7932 100644 --- a/app/src/main/res/layout/fragment_addcontroller.xml +++ b/app/src/main/res/layout/fragment_addcontroller.xml @@ -58,7 +58,7 @@ android:layout_marginTop="15dp" app:errorEnabled="true"> - - - - - + android:layout_height="wrap_content" + android:focusableInTouchMode="true" + android:minWidth="350dp" + android:orientation="vertical" + android:paddingLeft="15dp" + android:paddingRight="15dp" + android:paddingTop="15dp"> + android:src="@drawable/ic_save_black_48dp" /> + android:textAppearance="?android:textAppearanceMedium" /> + android:layout_marginTop="20dp" + android:text="Choose stripes to include" /> + android:layout_marginTop="10dp"> - + android:minWidth="350dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_addprofile_item.xml b/app/src/main/res/layout/fragment_addprofile_item.xml index e7cc317..f67711a 100644 --- a/app/src/main/res/layout/fragment_addprofile_item.xml +++ b/app/src/main/res/layout/fragment_addprofile_item.xml @@ -2,6 +2,5 @@ + android:layout_marginBottom="5dp" /> diff --git a/app/src/main/res/layout/fragment_addstripe.xml b/app/src/main/res/layout/fragment_addstripe.xml index 221df3b..fe714e6 100644 --- a/app/src/main/res/layout/fragment_addstripe.xml +++ b/app/src/main/res/layout/fragment_addstripe.xml @@ -165,7 +165,7 @@ android:layout_marginTop="15dp" app:errorEnabled="true"> - - - - . */ - // Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0-beta7' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:2.1.0' } } @@ -34,4 +29,4 @@ allprojects { repositories { jcenter() } -} +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b0dff85..7f4bae9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Nov 30 16:28:30 CET 2014 +#Sat Apr 30 20:15:11 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 91a7e26..9d82f78 --- a/gradlew +++ b/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; 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`