diff --git a/.gitignore b/.gitignore index 5a2a2d9..049da64 100644 --- a/.gitignore +++ b/.gitignore @@ -50,4 +50,6 @@ proguard/ .externalNativeBuild -google-services.json \ No newline at end of file +google-services.json + +app/release/ diff --git a/app/build.gradle b/app/build.gradle index 63bf443..0e6f71e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion compileAndTargetSdkVersion + compileSdkVersion 33 buildToolsVersion '30.0.3' defaultConfig { - applicationId "com.example.fcm" - minSdkVersion 21 - targetSdkVersion compileAndTargetSdkVersion - versionCode 1 - versionName "1.0" + applicationId "com.xtaolabs.fcm" + minSdkVersion 24 + targetSdkVersion 33 + versionCode 5 + versionName "1.0.5" resConfigs('en', 'xxxhdpi') ndk { abiFilters "x86", "x86_64", "arm64-v8a", "armeabi-v7a" @@ -33,12 +33,22 @@ android { preDexLibraries true maxProcessCount 8 } + + lintOptions { + checkReleaseBuilds false + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.firebase:firebase-analytics:18.0.3' - implementation 'com.google.firebase:firebase-messaging:21.1.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation platform('com.google.firebase:firebase-bom:32.2.0') + implementation 'com.google.firebase:firebase-analytics:21.3.0' + implementation 'com.google.firebase:firebase-messaging:23.2.0' } apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3293073..d4e050d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,10 @@ - + + + + + @@ -31,14 +35,16 @@ - + - + diff --git a/app/src/main/java/com/example/fcm/MainActivity.java b/app/src/main/java/com/example/fcm/MainActivity.java index 8cb9f1f..391a252 100644 --- a/app/src/main/java/com/example/fcm/MainActivity.java +++ b/app/src/main/java/com/example/fcm/MainActivity.java @@ -1,38 +1,46 @@ package com.example.fcm; +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; import android.os.Bundle; -import android.os.Handler; -import android.os.Looper; import android.util.Log; import android.view.View; import android.widget.TextView; +import android.widget.Toast; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; -import com.google.firebase.iid.FirebaseInstanceId; -import com.google.firebase.iid.InstanceIdResult; import com.google.firebase.messaging.FirebaseMessaging; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.Scanner; import static com.example.fcm.R.id.txt; public class MainActivity extends AppCompatActivity { - private static final String AUTH_KEY = "key=YOUR-SERVER-KEY"; private TextView mTextView; - private String token; + private static final String TAG = "Main"; + private final ActivityResultLauncher requestPermissionLauncher = + registerForActivityResult(new ActivityResultContracts.RequestPermission(), new ActivityResultCallback() { + @Override + public void onActivityResult(Boolean isGranted) { + if (isGranted) { + Toast.makeText(MainActivity.this, "Notifications permission granted", Toast.LENGTH_SHORT) + .show(); + } else { + Toast.makeText(MainActivity.this, "FCM can't post notifications without POST_NOTIFICATIONS permission", + Toast.LENGTH_LONG).show(); + } + } + }); @Override protected void onCreate(Bundle savedInstanceState) { @@ -40,32 +48,52 @@ public class MainActivity extends AppCompatActivity { setContentView(R.layout.activity_main); mTextView = findViewById(txt); - Bundle bundle = getIntent().getExtras(); - if (bundle != null) { - String tmp = ""; - for (String key : bundle.keySet()) { - Object value = bundle.get(key); - tmp += key + ": " + value + "\n\n"; - } - mTextView.setText(tmp); + askNotificationPermission(); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + // Create channel to show notifications. + String channelId = getString(R.string.notification_channel_id); + String channelName = "FCM"; + NotificationManager notificationManager = + getSystemService(NotificationManager.class); + notificationManager.createNotificationChannel(new NotificationChannel(channelId, + channelName, NotificationManager.IMPORTANCE_LOW)); } - FirebaseInstanceId.getInstance().getInstanceId().addOnCompleteListener(new OnCompleteListener() { - @Override - public void onComplete(@NonNull Task task) { - if (!task.isSuccessful()) { - token = task.getException().getMessage(); - Log.w("FCM TOKEN Failed", task.getException()); - } else { - token = task.getResult().getToken(); - Log.i("FCM TOKEN", token); - } + if (getIntent().getExtras() != null) { + for (String key : getIntent().getExtras().keySet()) { + Object value = getIntent().getExtras().get(key); + Log.d(TAG, "Key: " + key + " Value: " + value); } - }); + } } public void showToken(View view) { - mTextView.setText(token); + // Get token + // [START log_reg_token] + FirebaseMessaging.getInstance().getToken() + .addOnCompleteListener(new OnCompleteListener() { + @Override + public void onComplete(@NonNull Task task) { + if (!task.isSuccessful()) { + Log.w(TAG, "Fetching FCM registration token failed", task.getException()); + Toast.makeText(MainActivity.this, "GetToken Failed.", Toast.LENGTH_SHORT).show(); + return; + } + + // Get new FCM registration token + String token = task.getResult(); + + // show token + mTextView.setText(token); + Intent sendIntent = new Intent(); + sendIntent.setAction(Intent.ACTION_SEND); + sendIntent.putExtra(Intent.EXTRA_TEXT, token);//分享的文本内容 + sendIntent.setType("text/plain"); + startActivity(Intent.createChooser(sendIntent, "分享到")); + } + }); + // [END log_reg_token] } public void subscribe(View view) { @@ -79,90 +107,27 @@ public class MainActivity extends AppCompatActivity { } public void sendToken(View view) { - sendWithOtherThread("token"); + } public void sendTokens(View view) { - sendWithOtherThread("tokens"); + } public void sendTopic(View view) { - sendWithOtherThread("topic"); + } - private void sendWithOtherThread(final String type) { - new Thread(new Runnable() { - @Override - public void run() { - pushNotification(type); + private void askNotificationPermission() { + // This is only necessary for API Level > 33 (TIRAMISU) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + if (ContextCompat.checkSelfPermission(this, "android.permission.POST_NOTIFICATIONS") == + PackageManager.PERMISSION_GRANTED) { + // FCM SDK (and your app) can post notifications. + } else { + // Directly ask for the permission + requestPermissionLauncher.launch("android.permission.POST_NOTIFICATIONS"); } - }).start(); - } - - private void pushNotification(String type) { - JSONObject jPayload = new JSONObject(); - JSONObject jNotification = new JSONObject(); - JSONObject jData = new JSONObject(); - try { - jNotification.put("title", "Google I/O 2016"); - jNotification.put("body", "Firebase Cloud Messaging (App)"); - jNotification.put("sound", "default"); - jNotification.put("badge", "1"); - jNotification.put("click_action", "OPEN_ACTIVITY_1"); - jNotification.put("icon", "ic_notification"); - - jData.put("picture", "https://miro.medium.com/max/1400/1*QyVPcBbT_jENl8TGblk52w.png"); - - switch(type) { - case "tokens": - JSONArray ja = new JSONArray(); - ja.put("c5pBXXsuCN0:APA91bH8nLMt084KpzMrmSWRS2SnKZudyNjtFVxLRG7VFEFk_RgOm-Q5EQr_oOcLbVcCjFH6vIXIyWhST1jdhR8WMatujccY5uy1TE0hkppW_TSnSBiUsH_tRReutEgsmIMmq8fexTmL"); - ja.put(token); - jPayload.put("registration_ids", ja); - break; - case "topic": - jPayload.put("to", "/topics/news"); - break; - case "condition": - jPayload.put("condition", "'sport' in topics || 'news' in topics"); - break; - default: - jPayload.put("to", token); - } - - jPayload.put("priority", "high"); - jPayload.put("notification", jNotification); - jPayload.put("data", jData); - - URL url = new URL("https://fcm.googleapis.com/fcm/send"); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - conn.setRequestMethod("POST"); - conn.setRequestProperty("Authorization", AUTH_KEY); - conn.setRequestProperty("Content-Type", "application/json"); - conn.setDoOutput(true); - - // Send FCM message content. - OutputStream outputStream = conn.getOutputStream(); - outputStream.write(jPayload.toString().getBytes()); - - // Read FCM response. - InputStream inputStream = conn.getInputStream(); - final String resp = convertStreamToString(inputStream); - - Handler h = new Handler(Looper.getMainLooper()); - h.post(new Runnable() { - @Override - public void run() { - mTextView.setText(resp); - } - }); - } catch (JSONException | IOException e) { - e.printStackTrace(); } } - - private String convertStreamToString(InputStream is) { - Scanner s = new Scanner(is).useDelimiter("\\A"); - return s.hasNext() ? s.next().replace(",", ",\n") : ""; - } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/fcm/MyFirebaseMessagingService.java b/app/src/main/java/com/example/fcm/MyFirebaseMessagingService.java index d797aa5..a412598 100644 --- a/app/src/main/java/com/example/fcm/MyFirebaseMessagingService.java +++ b/app/src/main/java/com/example/fcm/MyFirebaseMessagingService.java @@ -3,56 +3,93 @@ package com.example.fcm; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; -import android.app.PendingIntent; import android.content.Context; -import android.content.Intent; -import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; import android.media.RingtoneManager; import android.os.Build; -import android.os.Bundle; import androidx.core.app.NotificationCompat; import android.util.Log; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; -import java.io.IOException; -import java.net.URL; -import java.util.Map; +/** + * NOTE: There can only be one service in each app that receives FCM messages. If multiple + * are declared in the Manifest then the first one will be chosen. + * + * In order to make this Java sample functional, you must remove the following from the Kotlin messaging + * service in the AndroidManifest.xml: + * + * + * + * + */ public class MyFirebaseMessagingService extends FirebaseMessagingService { public static final String FCM_PARAM = "picture"; private static final String CHANNEL_NAME = "FCM"; private static final String CHANNEL_DESC = "Firebase Cloud Messaging"; + private static final String TAG = "MyFirebaseMsgService"; private int numMessages = 0; @Override public void onMessageReceived(RemoteMessage remoteMessage) { - super.onMessageReceived(remoteMessage); - RemoteMessage.Notification notification = remoteMessage.getNotification(); - Map data = remoteMessage.getData(); - Log.d("FROM", remoteMessage.getFrom()); - sendNotification(notification, data); + // [START_EXCLUDE] + // There are two types of messages data messages and notification messages. Data messages + // are handled + // here in onMessageReceived whether the app is in the foreground or background. Data + // messages are the type + // traditionally used with GCM. Notification messages are only received here in + // onMessageReceived when the app + // is in the foreground. When the app is in the background an automatically generated + // notification is displayed. + // When the user taps on the notification they are returned to the app. Messages + // containing both notification + // and data payloads are treated as notification messages. The Firebase console always + // sends notification + // messages. For more see: https://firebase.google.com/docs/cloud-messaging/concept-options + // [END_EXCLUDE] + + // TODO(developer): Handle FCM messages here. + // Not getting messages here? See why this may be: https://goo.gl/39bRNJ + Log.d(TAG, "From: " + remoteMessage.getFrom()); + + // Check if message contains a data payload. + if (remoteMessage.getData().size() > 0) { + Log.d(TAG, "Message data payload: " + remoteMessage.getData()); + handleNow(); + } + + // Check if message contains a notification payload. + if (remoteMessage.getNotification() != null) { + Log.d(TAG, "Message Notification Body: " + remoteMessage.getNotification().getBody()); + String notificationBody = remoteMessage.getNotification().getBody(); + if (remoteMessage.getNotification().getBody() != null) { + sendNotification(remoteMessage.getNotification()); + } + } + + // Also if you intend on generating your own notifications as a result of a received FCM + // message, here is where that should be initiated. See sendNotification method below. + } + // [END receive_message] + + @Override + public void onNewToken(String token) { + Log.d(TAG, "Refreshed token: " + token); } - private void sendNotification(RemoteMessage.Notification notification, Map data) { - Bundle bundle = new Bundle(); - bundle.putString(FCM_PARAM, data.get(FCM_PARAM)); - - Intent intent = new Intent(this, SecondActivity.class); - intent.putExtras(bundle); - - PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); + private void handleNow() { + Log.d(TAG, "Short lived task is done."); + } + private void sendNotification(RemoteMessage.Notification notification) { NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, getString(R.string.notification_channel_id)) .setContentTitle(notification.getTitle()) - .setContentText(notification.getBody()) + .setStyle(new NotificationCompat.BigTextStyle().bigText(notification.getBody())) .setAutoCancel(true) .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)) - //.setSound(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.win)) - .setContentIntent(pendingIntent) .setContentInfo("Hello") .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher)) .setColor(getColor(R.color.colorAccent)) @@ -60,22 +97,9 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService { .setDefaults(Notification.DEFAULT_VIBRATE) .setNumber(++numMessages) .setSmallIcon(R.drawable.ic_notification); - - try { - String picture = data.get(FCM_PARAM); - if (picture != null && !"".equals(picture)) { - URL url = new URL(picture); - Bitmap bigPicture = BitmapFactory.decodeStream(url.openConnection().getInputStream()); - notificationBuilder.setStyle( - new NotificationCompat.BigPictureStyle().bigPicture(bigPicture).setSummaryText(notification.getBody()) - ); - } - } catch (IOException e) { - e.printStackTrace(); - } + final Notification app_notification = notificationBuilder.build(); NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationChannel channel = new NotificationChannel( getString(R.string.notification_channel_id), CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT @@ -91,8 +115,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService { assert notificationManager != null; notificationManager.createNotificationChannel(channel); } - assert notificationManager != null; - notificationManager.notify(0, notificationBuilder.build()); + notificationManager.notify(0, app_notification); } } \ No newline at end of file diff --git a/app/src/main/res/layout/notice_pic.xml b/app/src/main/res/layout/notice_pic.xml new file mode 100644 index 0000000..95ca12a --- /dev/null +++ b/app/src/main/res/layout/notice_pic.xml @@ -0,0 +1,43 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 83b23fb..02281c2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - FCM + Xtao FCM Send Token Send Tokens Send Topic diff --git a/gradle.properties b/gradle.properties index 915f0e6..135bec9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,5 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +org.gradle.jvmargs=-Xmx1536M --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372ae..7454180 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 3dca5b9..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu May 18 21:45:47 ICT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip diff --git a/gradlew b/gradlew index 9d82f78..3da45c1 100755 --- a/gradlew +++ b/gradlew @@ -1,74 +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 -# 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 # 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 @@ -77,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 @@ -85,76 +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 -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 - -# 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"` - 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 - # 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\"" - fi - i=$((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" ;; +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 -# 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" +# 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. -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + 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 + # 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 +fi + +# 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 aec9973..ac1b06f 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