diff --git a/app/build.gradle b/app/build.gradle
index 1ed8b4f5..73b06be5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,46 +1,48 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 24
- buildToolsVersion "23.0.3"
+ compileSdkVersion 33
defaultConfig {
applicationId "org.traccar.manager"
- minSdkVersion 14
- targetSdkVersion 24
+ minSdkVersion 19
+ targetSdkVersion 33
versionCode 9
versionName "1.7"
multiDexEnabled = true
vectorDrawables.useSupportLibrary = true
- }
-
- dexOptions {
- incremental true
- javaMaxHeapSize "4g"
- }
- packagingOptions {
- exclude 'META-INF/LICENSE'
- exclude 'META-INF/NOTICE'
+ testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
release {
minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt')
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+ packagingOptions {
+ exclude 'META-INF/LICENSE'
+ exclude 'META-INF/NOTICE'
+ }
+
}
dependencies {
- compile 'com.android.support:multidex:1.0.1'
- compile 'com.android.support:appcompat-v7:24.2.1'
- compile 'com.android.support:design:24.2.1'
- compile 'com.google.android.gms:play-services:9.6.1'
- compile 'com.squareup.okhttp3:okhttp-ws:3.4.1'
- compile "com.squareup.okhttp3:okhttp-urlconnection:3.4.1"
- compile 'com.squareup.retrofit2:retrofit:2.1.0'
- compile 'com.squareup.retrofit2:converter-jackson:2.1.0'
- testCompile 'junit:junit:4.12'
- testCompile 'org.robolectric:robolectric:3.0'
+ implementation 'androidx.multidex:multidex:2.0.1'
+ implementation 'androidx.appcompat:appcompat:1.5.1'
+ implementation 'com.google.android.gms:play-services-maps:18.1.0'
+ implementation 'com.google.android.gms:play-services-location:21.0.1'
+ implementation 'com.squareup.okhttp3:okhttp-ws:3.4.1'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+ implementation "com.squareup.okhttp3:okhttp-urlconnection:3.4.1"
+ implementation 'com.squareup.retrofit2:retrofit:2.1.0'
+ implementation 'com.squareup.retrofit2:converter-jackson:2.1.0'
+ implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
+ testImplementation 'junit:junit:4.13.2'
+ testImplementation 'org.robolectric:robolectric:4.2.1'
}
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
new file mode 100644
index 00000000..ee16c086
Binary files /dev/null and b/app/release/app-release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
new file mode 100644
index 00000000..0d9d9692
--- /dev/null
+++ b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "org.traccar.manager",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 9,
+ "versionName": "1.7",
+ "outputFile": "app-release.apk"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5a42d4d0..f2cb031d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
-
@@ -22,7 +21,8 @@
android:value="AIzaSyAMQYClXhA2tZdfCzu9EK9wUDWtCRQ6Bj0" />
+ android:name=".LoginActivity"
+ android:exported="true">
@@ -36,10 +36,6 @@
android:name=".DevicesActivity"
android:label="@string/devices_title" />
-
-
diff --git a/app/src/main/java/org/traccar/manager/DevicesActivity.java b/app/src/main/java/org/traccar/manager/DevicesActivity.java
index 3d206c27..b53479da 100644
--- a/app/src/main/java/org/traccar/manager/DevicesActivity.java
+++ b/app/src/main/java/org/traccar/manager/DevicesActivity.java
@@ -16,9 +16,9 @@
package org.traccar.manager;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
public class DevicesActivity extends AppCompatActivity {
diff --git a/app/src/main/java/org/traccar/manager/DevicesFragment.java b/app/src/main/java/org/traccar/manager/DevicesFragment.java
index a23456c4..21b0f3cf 100644
--- a/app/src/main/java/org/traccar/manager/DevicesFragment.java
+++ b/app/src/main/java/org/traccar/manager/DevicesFragment.java
@@ -18,13 +18,12 @@
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.app.ListFragment;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.ListView;
+import androidx.fragment.app.ListFragment;
import org.traccar.manager.model.Device;
-
import java.util.List;
import okhttp3.OkHttpClient;
diff --git a/app/src/main/java/org/traccar/manager/LoginActivity.java b/app/src/main/java/org/traccar/manager/LoginActivity.java
index 3b15d8db..7358cce8 100644
--- a/app/src/main/java/org/traccar/manager/LoginActivity.java
+++ b/app/src/main/java/org/traccar/manager/LoginActivity.java
@@ -16,7 +16,7 @@
package org.traccar.manager;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
public class LoginActivity extends AppCompatActivity {
diff --git a/app/src/main/java/org/traccar/manager/LoginFragment.java b/app/src/main/java/org/traccar/manager/LoginFragment.java
index 4f0e9d53..73f2f37b 100644
--- a/app/src/main/java/org/traccar/manager/LoginFragment.java
+++ b/app/src/main/java/org/traccar/manager/LoginFragment.java
@@ -22,8 +22,6 @@
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
@@ -33,6 +31,8 @@
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import retrofit2.Retrofit;
diff --git a/app/src/main/java/org/traccar/manager/MainActivity.java b/app/src/main/java/org/traccar/manager/MainActivity.java
index 46718203..9db478f4 100644
--- a/app/src/main/java/org/traccar/manager/MainActivity.java
+++ b/app/src/main/java/org/traccar/manager/MainActivity.java
@@ -16,8 +16,9 @@
package org.traccar.manager;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
public class MainActivity extends AppCompatActivity {
diff --git a/app/src/main/java/org/traccar/manager/MainApplication.java b/app/src/main/java/org/traccar/manager/MainApplication.java
index 7d2034f4..8bef00ba 100644
--- a/app/src/main/java/org/traccar/manager/MainApplication.java
+++ b/app/src/main/java/org/traccar/manager/MainApplication.java
@@ -17,9 +17,8 @@
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
-import android.support.multidex.MultiDexApplication;
import android.widget.Toast;
-
+import androidx.multidex.MultiDexApplication;
import org.traccar.manager.model.User;
import java.net.CookieManager;
diff --git a/app/src/main/java/org/traccar/manager/MainFragment.java b/app/src/main/java/org/traccar/manager/MainFragment.java
index f621daf0..ada742b0 100644
--- a/app/src/main/java/org/traccar/manager/MainFragment.java
+++ b/app/src/main/java/org/traccar/manager/MainFragment.java
@@ -26,6 +26,8 @@
import android.view.View;
import android.widget.TextView;
+import androidx.fragment.app.FragmentTransaction;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
@@ -60,12 +62,12 @@ public class MainFragment extends SupportMapFragment implements OnMapReadyCallba
public static final int REQUEST_DEVICE = 1;
public static final int RESULT_SUCCESS = 1;
-
+ private FragmentTransaction fragmentTransaction;
private GoogleMap map;
private Handler handler = new Handler();
private ObjectMapper objectMapper = new ObjectMapper();
-
+ private long deviceId;
private Map devices = new HashMap<>();
private Map positions = new HashMap<>();
private Map markers = new HashMap<>();
@@ -104,7 +106,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_DEVICE && resultCode == RESULT_SUCCESS) {
- long deviceId = data.getLongExtra(DevicesFragment.EXTRA_DEVICE_ID, 0);
+ deviceId = data.getLongExtra(DevicesFragment.EXTRA_DEVICE_ID, 0);
Position position = positions.get(deviceId);
if (position != null) {
map.moveCamera(CameraUpdateFactory.newLatLng(
@@ -126,13 +128,25 @@ public View getInfoWindow(Marker marker) {
@Override
public View getInfoContents(Marker marker) {
- View view = getLayoutInflater(null).inflate(R.layout.view_info, null);
+ View view = getLayoutInflater().inflate(R.layout.view_info, null);
((TextView) view.findViewById(R.id.title)).setText(marker.getTitle());
((TextView) view.findViewById(R.id.details)).setText(marker.getSnippet());
return view;
}
});
+
+ map.setOnInfoWindowClickListener(new GoogleMap.OnInfoWindowClickListener() {
+ @Override
+ public void onInfoWindowClick(Marker marker) {
+ Bundle args = new Bundle();
+ args.putLong("deviceId", deviceId);
+ fragmentTransaction =getFragmentManager().beginTransaction();
+ SendCommandFragment sendCommandFragment = new SendCommandFragment();
+ sendCommandFragment.setArguments(args);
+ sendCommandFragment.show(fragmentTransaction, "sendCommand_tag");
+ }
+ });
createWebSocket();
}
@@ -188,7 +202,7 @@ private void handleMessage(String message) throws IOException {
Update update = objectMapper.readValue(message, Update.class);
if (update != null && update.positions != null) {
for (Position position : update.positions) {
- long deviceId = position.getDeviceId();
+ deviceId = position.getDeviceId();
if (devices.containsKey(deviceId)) {
LatLng location = new LatLng(position.getLatitude(), position.getLongitude());
Marker marker = markers.get(deviceId);
diff --git a/app/src/main/java/org/traccar/manager/SendCommandActivity.java b/app/src/main/java/org/traccar/manager/SendCommandActivity.java
index 2d09b03b..8b09192d 100644
--- a/app/src/main/java/org/traccar/manager/SendCommandActivity.java
+++ b/app/src/main/java/org/traccar/manager/SendCommandActivity.java
@@ -16,7 +16,7 @@
package org.traccar.manager;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
public class SendCommandActivity extends AppCompatActivity {
diff --git a/app/src/main/java/org/traccar/manager/SendCommandFragment.java b/app/src/main/java/org/traccar/manager/SendCommandFragment.java
index ec82cc19..48c7fa2d 100644
--- a/app/src/main/java/org/traccar/manager/SendCommandFragment.java
+++ b/app/src/main/java/org/traccar/manager/SendCommandFragment.java
@@ -17,8 +17,6 @@
import android.content.res.Resources;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -28,22 +26,24 @@
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
-import android.widget.NumberPicker;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
import org.traccar.manager.model.Command;
import org.traccar.manager.model.CommandType;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import retrofit2.Call;
import retrofit2.Response;
-public class SendCommandFragment extends Fragment {
+public class SendCommandFragment extends DialogFragment {
class CommandTypeDataHolder {
private String type;
@@ -132,7 +132,7 @@ public void onNothingSelected(AdapterView parent) {
}
});
- final long deviceId = getActivity().getIntent().getExtras().getLong(EXTRA_DEVICE_ID);
+ final long deviceId = getArguments().getLong(EXTRA_DEVICE_ID);
final MainApplication application = (MainApplication) getActivity().getApplication();
final WebService service = application.getService();
service.getCommandTypes(deviceId).enqueue(new WebServiceCallback>(getContext()) {
@@ -175,9 +175,14 @@ public void onClick(View v) {
public void onSuccess(Response response) {
Toast.makeText(getContext(), R.string.command_sent, Toast.LENGTH_LONG).show();
}
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ super.onFailure(call, t);
+ Toast.makeText(getActivity(), R.string.command_not_sent, Toast.LENGTH_LONG).show();
+ }
});
- getActivity().finish();
}
});
diff --git a/app/src/main/java/org/traccar/manager/WebService.java b/app/src/main/java/org/traccar/manager/WebService.java
index 2e3cc1d1..87c7e29f 100644
--- a/app/src/main/java/org/traccar/manager/WebService.java
+++ b/app/src/main/java/org/traccar/manager/WebService.java
@@ -23,13 +23,11 @@
import java.util.List;
import retrofit2.Call;
-import retrofit2.Response;
import retrofit2.http.Body;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET;
import retrofit2.http.POST;
-import retrofit2.http.Path;
import retrofit2.http.Query;
public interface WebService {
@@ -41,9 +39,10 @@ public interface WebService {
@GET("/api/devices")
Call> getDevices();
- @GET("/api/commandtypes")
+ @GET("/api/commands/types")
Call> getCommandTypes(@Query("deviceId") long deviceId);
- @POST("/api/commands")
+ @POST("/api/commands/send")
Call sendCommand(@Body Command command);
+
}
diff --git a/app/src/main/java/org/traccar/manager/WebServiceCallback.java b/app/src/main/java/org/traccar/manager/WebServiceCallback.java
index e82ea619..8ee7fdfe 100644
--- a/app/src/main/java/org/traccar/manager/WebServiceCallback.java
+++ b/app/src/main/java/org/traccar/manager/WebServiceCallback.java
@@ -17,7 +17,6 @@
import android.content.Context;
import android.widget.Toast;
-
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
diff --git a/app/src/main/res/layout/activity_layout.xml b/app/src/main/res/layout/activity_layout.xml
index 2a1b97ae..fcf0dd0d 100644
--- a/app/src/main/res/layout/activity_layout.xml
+++ b/app/src/main/res/layout/activity_layout.xml
@@ -1,33 +1,28 @@
-
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:minHeight="?attr/actionBarSize"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:logo="@mipmap/ic_launcher"
+ android:background="@android:color/darker_gray"
+ app:popupTheme="@style/ThemeOverlay.AppCompat.Dark" />
-
-
+
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 8441f252..867bde94 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,14 +1,13 @@
-
-
-
-
+
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 02c881ff..897f9061 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -3,12 +3,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
-
-
-
+ android:layout_height="wrap_content"
+ android:hint="@string/settings_email"
+ android:inputType="textEmailAddress" />
+
-
-
-
+ android:layout_height="wrap_content"
+ android:hint="@string/settings_password"
+ android:inputType="textPassword" />
-
-
-
-
-
-
+ android:orientation="vertical" >
@@ -90,7 +87,7 @@
-
-
-
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb035456..5e94ab66 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,11 +2,9 @@
Traccar Manager
Login
Loading…
-
Second
Minute
Hour
-
Connection error
Server request error
Invalid server URL
@@ -34,13 +32,13 @@
Show on map
Send command
-
+ Click to Send Commands.
Command
Frequency
Unit
Send
Command has been sent
-
+ Command NOT sent - ERROR
Arm
Disarm
Engine Stop
diff --git a/build.gradle b/build.gradle
index aa844236..b1ff435f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
-buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:2.2.0'
- }
-}
+ id 'com.android.application' version '7.3.0' apply false
+ id 'com.android.library' version '7.3.0' apply false
-allprojects {
- repositories {
- jcenter()
- }
-}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..35105a86
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,19 @@
+# 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.
+org.gradle.jvmargs=-Xmx1536m
+android.enableJetifier=true
+android.useAndroidX=true
+android.nonTransitiveRClass=true
+# 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
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8c0fb64a..41d9927a 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 dbdc05d2..f8256ced 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+
diff --git a/gradlew b/gradlew
index 91a7e269..1b6c7873 100755
--- a/gradlew
+++ b/gradlew
@@ -1,79 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 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.
+# 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.
+#
##############################################################################
-##
-## 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/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
-# 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
+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
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${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"
+MAX_FD=maximum
-warn ( ) {
+warn () {
echo "$*"
-}
+} >&2
-die ( ) {
+die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
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"
-# 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\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
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
@@ -82,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ 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.
Please set the JAVA_HOME variable in your environment to match the
@@ -90,75 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "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*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ 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" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- # 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
# 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=$((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
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# 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 8a0b282a..107acd32 100644
--- a/gradlew.bat
+++ b/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,20 +24,23 @@
@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
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ 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%
@@ -45,34 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windowz 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.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/settings.gradle b/settings.gradle
index e7b4def4..14fa67cf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,20 @@
+pluginManagement {
+
+ repositories {
+ gradlePluginPortal()
+ google()
+ mavenCentral()
+ }
+
+}
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+ repositories {
+ google()
+ mavenCentral()
+ }
+
+}
+
+rootProject.name = "native"
include ':app'