diff --git a/.gitignore b/.gitignore
index de362ea..064008a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,14 @@
-/.idea
-.gradle
-local.properties
+/.idea
+.gradle
+local.properties
+=======
+codeiris
+*.iml
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+*/build
+projectFilesBackup/
+/build-logic/convention/build/
diff --git a/app/build.gradle b/app/build.gradle
index 4b8d87a..882b769 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,10 +1,13 @@
 apply plugin: 'com.android.application'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
-    compileSdkVersion 33
+    compileSdk 33
+
     defaultConfig {
         applicationId 'ru.qualitylab.evotor.evotortest6'
         minSdkVersion 23
+        //noinspection EditedTargetSdkVersion
         targetSdkVersion 33
         versionCode 6
         versionName "6"
@@ -28,19 +31,26 @@ android {
     productFlavors {
     }
     namespace 'ru.qualitylab.evotor.evotortest6'
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlin {
+        jvmToolchain(8)
+    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
     implementation 'com.github.evotor:integration-library:v0.6.03'
 
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation 'com.thedeanda:lorem:2.1'
-
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    testImplementation 'junit:junit:4.13.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f22b1a7..9aa7040 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
     <!-- Разрешение на использование сканера штрихкодов -->
     <uses-permission android:name="ru.evotor.devices.SCANNER_RECEIVER" />
     <!-- Разрешение на печать своих данных в чеке -->
@@ -8,6 +9,7 @@
     <uses-permission android:name="ru.evotor.permission.receipt.print.INTERNET_RECEIPT" />
     <!-- Поддержка сторонней платёжной системы -->
     <uses-permission android:name="ru.evotor.permission.PAYMENT_SYSTEM" />
+    <uses-permission android:name="ru.evotor.permission.COMBINED" />
 
     <application
         android:allowBackup="true"
@@ -16,13 +18,16 @@
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
+        <activity
+            android:name=".combo_payment.ComboPaymentActivity"
+            android:exported="false" />
         <!-- UUID номер приложения в системе Эвотор. Вкладка APK приложения в ЛК -->
         <meta-data
             android:name="app_uuid"
             android:value="66998575-ee62-4e87-b191-89f351fdc572" />
 
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity"
             android:exported="true">
 
             <!-- Фон, на котором отображается иконка приложения. -->
@@ -32,21 +37,14 @@
 
             <!-- Чтобы заменить кнопку Продажа в интерфейсе терминала -->
             <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
                 <action android:name="ru.evotor.intent.action.SELL_MAIN" />
 
                 <category android:name="android.intent.category.EVOTOR" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-
-            <!-- Чтобы заменить кнопку Продажа в интерфейсе терминала -->
-            <!--
-                        <intent-filter>
-                            &lt;!&ndash;Иконка приложения на главном экране смарт-терминала&ndash;&gt;
-                            <action android:name="android.intent.action.MAIN" />
-                            <category android:name="android.intent.category.EVOTOR" />
-                        </intent-filter>
-            -->
         </activity>
+
         <activity android:name=".SuggestActivity" />
         <activity android:name=".EditActivity" />
         <activity android:name=".UserApiActivity" />
@@ -280,6 +278,20 @@
         </service>
         -->
 
+        <service
+            android:name=".combo_payment.ComboPaymentService"
+            android:exported="true"
+            android:label="Комбооплата">
+            <meta-data
+                android:name="ru.evotor.sales_screen.BACKGROUND_COLOR"
+                android:value="@android:color/white" />
+            <intent-filter>
+                <action android:name="evo.v2.receipt.sell.payment.COMBINED" />
+                <action android:name="evo.v2.receipt.payback.payment.COMBINED" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/ru/qualitylab/evotor/evotortest6/MainActivity.java b/app/src/main/java/ru/qualitylab/evotor/evotortest6/MainActivity.java
index 3ae475c..2ee7fb0 100644
--- a/app/src/main/java/ru/qualitylab/evotor/evotortest6/MainActivity.java
+++ b/app/src/main/java/ru/qualitylab/evotor/evotortest6/MainActivity.java
@@ -127,7 +127,6 @@ public void openReceiptAndEmail() {
                         null,
                         //Наименование
                         "1234",
-                        //Наименование единицы измерения
                         new Measure("12", 0, 0),
                         //Цена без скидок
                         new BigDecimal(1000),
@@ -226,7 +225,6 @@ public void openReceipt() {
                                 null,
                                 //Наименование
                                 "Зубочистки",
-                                //Наименование единицы измерения
                                 new Measure("кг", 0, 0),
                                 //Цена без скидок
                                 new BigDecimal(200),
diff --git a/app/src/main/java/ru/qualitylab/evotor/evotortest6/combo_payment/ComboPaymentActivity.kt b/app/src/main/java/ru/qualitylab/evotor/evotortest6/combo_payment/ComboPaymentActivity.kt
new file mode 100644
index 0000000..f30aa87
--- /dev/null
+++ b/app/src/main/java/ru/qualitylab/evotor/evotortest6/combo_payment/ComboPaymentActivity.kt
@@ -0,0 +1,149 @@
+package ru.qualitylab.evotor.evotortest6.combo_payment
+
+import android.os.Bundle
+import android.widget.Button
+import android.widget.EditText
+import android.widget.Toast
+import ru.evotor.framework.component.PaymentPerformer
+import ru.evotor.framework.core.IntegrationAppCompatActivity
+import ru.evotor.framework.core.action.event.receipt.changes.receipt.SetExtra
+import ru.evotor.framework.core.action.event.receipt.payment.combined.event.PaymentDelegatorPaybackData
+import ru.evotor.framework.core.action.event.receipt.payment.combined.result.PaymentDelegatorSelectedEventResult
+import ru.evotor.framework.payment.PaymentPurpose
+import ru.evotor.framework.payment.PaymentSystem
+import ru.evotor.framework.payment.PaymentType
+import ru.evotor.framework.receipt.Receipt
+import ru.evotor.framework.receipt.ReceiptApi
+import ru.qualitylab.evotor.evotortest6.R
+import java.math.BigDecimal
+import java.util.UUID
+
+class ComboPaymentActivity : IntegrationAppCompatActivity() {
+    private var availablePaybackSums: ArrayList<PaymentDelegatorPaybackData>? = null
+    private lateinit var receiptUuid: String
+
+    private var isPayback: Boolean = false
+    private var isBuyback: Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_combo_payment)
+
+        availablePaybackSums = intent.getSerializableExtra(KEY_AVAILABLE_PAYBACK_SUM) as ArrayList<PaymentDelegatorPaybackData>?
+
+        receiptUuid = intent.getStringExtra(KEY_RECEIPT_UUID)!!
+
+        isPayback = ReceiptApi.getReceipt(this, receiptUuid)?.header?.type == Receipt.Type.PAYBACK
+        isBuyback = ReceiptApi.getReceipt(this, receiptUuid)?.header?.type == Receipt.Type.BUYBACK
+
+        findViewById<Button>(R.id.payment_cash).setOnClickListener {
+            val paymentId = UUID.randomUUID().toString()
+            val paymentTotal = findViewById<EditText>(R.id.sum_input).text.toString()
+
+            val paymentDescription = "Наличные"
+            val paymentPerformer = PaymentPerformer(
+                PaymentSystem(
+                    PaymentType.CASH,
+                    paymentDescription,
+                    "ru.evotor.paymentSystem.cash.base"
+                ),
+                null,
+                null,
+                null,
+                null
+            )
+
+            val valid = validatePaybackSum(BigDecimal(paymentTotal), paymentPerformer)
+
+            if (valid) {
+                onPaymentDelegatorSelected(
+                    PaymentPurpose(
+                        paymentId,
+                        paymentPerformer.paymentSystem?.paymentSystemId,
+                        paymentPerformer,
+                        BigDecimal(paymentTotal),
+                        null,
+                        paymentDescription
+                    ),
+                    null
+                )
+            } else {
+                Toast.makeText(this, "Сумма операции не должна превышать доступную сумму для возврата", Toast.LENGTH_SHORT).show()
+            }
+        }
+
+        findViewById<Button>(R.id.payment_card).setOnClickListener {
+            val paymentId = UUID.randomUUID().toString()
+            val paymentTotal = findViewById<EditText>(R.id.sum_input).text.toString()
+
+            val paymentDescription = "Банковская карта"
+            val paymentPerformer = PaymentPerformer(
+                PaymentSystem(
+                    PaymentType.ELECTRON,
+                    paymentDescription,
+                    "ru.evotor.paymentSystem.cashless.base"
+                ),
+                null,
+                null,
+                null,
+                null
+            )
+
+            val valid = validatePaybackSum(BigDecimal(paymentTotal), paymentPerformer)
+
+            if (valid) {
+                onPaymentDelegatorSelected(
+                    PaymentPurpose(
+                        paymentId,
+                        paymentPerformer.paymentSystem?.paymentSystemId,
+                        paymentPerformer,
+                        BigDecimal(paymentTotal),
+                        null,
+                        paymentDescription
+                    ),
+                    null
+                )
+            } else {
+                Toast.makeText(this, "Сумма операции не должна превышать доступную сумму для возврата", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    private fun onPaymentDelegatorSelected(paymentPurpose: PaymentPurpose, extra: SetExtra?) {
+        setIntegrationResult(PaymentDelegatorSelectedEventResult(paymentPurpose, extra))
+        finish()
+    }
+
+    private fun validatePaybackSum(sum: BigDecimal, performer: PaymentPerformer): Boolean {
+        if (availablePaybackSums != null && availablePaybackSums!!.isNotEmpty() && (isPayback || isBuyback)) {
+            val receipt = ReceiptApi.getReceipt(this, receiptUuid)
+            val paybackSums = receipt?.getPayments()?.associate { payment ->
+                payment.paymentPerformer.paymentSystem?.paymentSystemId to payment.value
+            }
+                ?: emptyMap()
+
+            val availablePerformer = availablePaybackSums!!.firstOrNull {
+                it.performer?.paymentSystem?.paymentSystemId == performer.paymentSystem?.paymentSystemId
+            }
+
+            availablePerformer?.let { p ->
+                val availableSum = if (paybackSums.containsKey(p.performer?.paymentSystem?.paymentSystemId)) {
+                    p.sum?.minus(paybackSums[p.performer?.paymentSystem?.paymentSystemId]!!)
+                } else {
+                    p.sum
+                }
+
+                return sum <= availableSum
+            }
+
+            return false
+        }
+
+        return true
+    }
+
+    companion object {
+        const val KEY_RECEIPT_UUID = "receiptUuid"
+        const val KEY_AVAILABLE_PAYBACK_SUM = "availablePaybackSum"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/qualitylab/evotor/evotortest6/combo_payment/ComboPaymentService.kt b/app/src/main/java/ru/qualitylab/evotor/evotortest6/combo_payment/ComboPaymentService.kt
new file mode 100644
index 0000000..d812be3
--- /dev/null
+++ b/app/src/main/java/ru/qualitylab/evotor/evotortest6/combo_payment/ComboPaymentService.kt
@@ -0,0 +1,45 @@
+package ru.qualitylab.evotor.evotortest6.combo_payment
+
+import android.content.Intent
+import ru.evotor.framework.component.PaymentPerformer
+import ru.evotor.framework.core.IntegrationService
+import ru.evotor.framework.core.action.event.receipt.payment.combined.PaybackPaymentDelegatorEventProcessor
+import ru.evotor.framework.core.action.event.receipt.payment.combined.PaymentDelegatorEventProcessor
+import ru.evotor.framework.core.action.event.receipt.payment.combined.event.PaybackPaymentDelegatorEvent
+import ru.evotor.framework.core.action.event.receipt.payment.combined.event.PaymentDelegatorEvent
+import ru.evotor.framework.core.action.processor.ActionProcessor
+import ru.evotor.framework.payment.PaymentSystem
+import ru.evotor.framework.payment.PaymentType
+
+class ComboPaymentService : IntegrationService() {
+    override fun createProcessors(): MutableMap<String, ActionProcessor>? = mutableMapOf(
+        Pair(
+            PaymentDelegatorEvent.NAME_ACTION,
+            object : PaymentDelegatorEventProcessor() {
+                override fun call(action: String, event: PaymentDelegatorEvent, callback: Callback) {
+                    callback.startActivity(
+                        Intent(this@ComboPaymentService, ComboPaymentActivity::class.java)
+                            .putExtra(ComboPaymentActivity.KEY_RECEIPT_UUID, event.receiptUuid)
+                    )
+                }
+            }
+        ),
+
+        Pair(
+            PaybackPaymentDelegatorEvent.NAME_ACTION,
+            object : PaybackPaymentDelegatorEventProcessor() {
+                override fun call(
+                    action: String,
+                    event: PaybackPaymentDelegatorEvent,
+                    callback: Callback
+                ) {
+                    callback.startActivity(
+                        Intent(this@ComboPaymentService, ComboPaymentActivity::class.java)
+                            .putExtra(ComboPaymentActivity.KEY_RECEIPT_UUID, event.receiptUuid)
+                            .putExtra(ComboPaymentActivity.KEY_AVAILABLE_PAYBACK_SUM, event.availablePaybackSum)
+                    )
+                }
+            }
+        )
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_combo_payment.xml b/app/src/main/res/layout/activity_combo_payment.xml
new file mode 100644
index 0000000..d69966c
--- /dev/null
+++ b/app/src/main/res/layout/activity_combo_payment.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".combo_payment.ComboPaymentActivity">
+
+    <EditText
+        android:id="@+id/sum_input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="number"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <Button
+        android:id="@+id/payment_cash"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/sum_input"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Cash"/>
+
+    <Button
+        android:id="@+id/payment_card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/payment_cash"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Card"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1c56072..5885930 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/build.gradle b/build.gradle
index fa88363..d3e250e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle.properties b/gradle.properties
index 12f0f32..f428c2b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,7 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=false
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.daemon=true
 org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f6b961f..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 c603e7f..da1db5f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Dec 19 14:32:33 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
index cccdd3d..1b6c787
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/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/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_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=""
+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 () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,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
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        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"`
-    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\""
+    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
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-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 f955316..ac1b06f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,84 +1,89 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@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=
-
-@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
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@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
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+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 execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+: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 %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega