diff --git a/blessedDeps.gradle b/blessedDeps.gradle index ecf18780bc..b7aee5fab7 100644 --- a/blessedDeps.gradle +++ b/blessedDeps.gradle @@ -37,13 +37,13 @@ rootProject.ext.ANDROID_DATA_BINDING = "1.3.1" rootProject.ext.ANDROID_RUNTIME_VERSION = "4.1.1.4" rootProject.ext.ANDROID_TEST_RUNNER = "1.4.0" rootProject.ext.ASSERTJ_VERSION = "1.7.1" -rootProject.ext.AUTO_VALUE_VERSION = "1.7.4" +rootProject.ext.AUTO_VALUE_VERSION = "1.8.2" rootProject.ext.GLIDE_VERSION = "4.12.0" rootProject.ext.GOOGLE_TESTING_COMPILE_VERSION = "0.19" rootProject.ext.INCAP_VERSION = "0.3" rootProject.ext.JUNIT_VERSION = "4.13.1" -rootProject.ext.KOTLIN_COROUTINES_TEST_VERSION = "1.4.1" -rootProject.ext.KOTLIN_COROUTINES_VERSION = "1.3.9" +rootProject.ext.KOTLIN_COROUTINES_TEST_VERSION = "1.5.1" +rootProject.ext.KOTLIN_COROUTINES_VERSION = "1.5.2" rootProject.ext.KOTLINX_METADATA = "0.3.0" rootProject.ext.LOTTIE_VERSION = "2.8.0" rootProject.ext.MOCKITO_VERSION = "3.7.7" @@ -51,12 +51,12 @@ rootProject.ext.PARIS_VERSION = "2.0.1" rootProject.ext.ROBOLECTRIC_VERSION = "4.5.1" rootProject.ext.SQUARE_JAVAPOET_VERSION = "1.13.0" rootProject.ext.SQUARE_KOTLINPOET_VERSION = "1.10.2" -rootProject.ext.COMPOSE_VERSION = "1.0.4" +rootProject.ext.COMPOSE_VERSION = "1.0.5" rootProject.ext.COMPOSE_ACTIVITY_VERSION = "1.3.1" rootProject.ext.KOTLINX_LIFECYCLE_RUNTIME_VERSION = "2.3.0" -rootProject.ext.KSP_VERSION = "1.5.31-1.0.0" -rootProject.ext.XPROCESSING_VERSION = "2.4.0-beta01" -rootProject.ext.KOTLIN_TESTING_COMPILE_VERSION = '1.4.5' +rootProject.ext.KSP_VERSION = "1.6.0-1.0.1" +rootProject.ext.XPROCESSING_VERSION = "2.4.0-SNAPSHOT" +rootProject.ext.KOTLIN_TESTING_COMPILE_VERSION = '1.4.6' rootProject.ext.deps = [ activityCompose : "androidx.activity:activity-compose:$COMPOSE_ACTIVITY_VERSION", diff --git a/build.gradle b/build.gradle index f0bdde91e2..3279f11f65 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.KOTLIN_VERSION = "1.5.31" + ext.KOTLIN_VERSION = "1.6.0" ext.ANDROID_PLUGIN_VERSION = '7.0.3' - ext.KSP_VERSION = '1.5.31-1.0.0' + ext.KSP_VERSION = '1.6.0-1.0.1' repositories { google() mavenCentral() gradlePluginPortal() - jcenter() } dependencies { classpath "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION" @@ -32,7 +31,7 @@ allprojects { repositories { google() mavenCentral() - jcenter() + maven { url "https://androidx.dev/snapshots/builds/7932053/artifacts/repository/" } } // Prevent javadoc task complaining about errors with kotlin files diff --git a/epoxy-kspsample/build.gradle b/epoxy-kspsample/build.gradle index fbeb41f5ea..0d19935b1f 100644 --- a/epoxy-kspsample/build.gradle +++ b/epoxy-kspsample/build.gradle @@ -23,11 +23,13 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = '1.8' + freeCompilerArgs += "-Xjvm-default=all" + jvmTarget = "11" + targetCompatibility = "11" } } diff --git a/epoxy-kspsample/src/main/java/com/airbnb/epoxy/ksp/sample/MainActivity.kt b/epoxy-kspsample/src/main/java/com/airbnb/epoxy/ksp/sample/MainActivity.kt index 19d58d90af..e01f1cbd9b 100644 --- a/epoxy-kspsample/src/main/java/com/airbnb/epoxy/ksp/sample/MainActivity.kt +++ b/epoxy-kspsample/src/main/java/com/airbnb/epoxy/ksp/sample/MainActivity.kt @@ -4,6 +4,7 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.airbnb.epoxy.EpoxyRecyclerView import com.airbnb.epoxy.ksp.sample.epoxyviews.headerView +import com.airbnb.epoxy.ksp.sample.epoxyviews.footerView class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -15,6 +16,10 @@ class MainActivity : AppCompatActivity() { id("header") title("Hello World") } + footerView { + id("footer") + text("footer") + } } } } diff --git a/epoxy-kspsample/src/main/java/com/airbnb/epoxy/ksp/sample/epoxyviews/FooterView.kt b/epoxy-kspsample/src/main/java/com/airbnb/epoxy/ksp/sample/epoxyviews/FooterView.kt new file mode 100644 index 0000000000..102765805f --- /dev/null +++ b/epoxy-kspsample/src/main/java/com/airbnb/epoxy/ksp/sample/epoxyviews/FooterView.kt @@ -0,0 +1,22 @@ +package com.airbnb.epoxy.ksp.sample.epoxyviews + +import android.widget.LinearLayout +import android.widget.TextView +import com.airbnb.epoxy.EpoxyAttribute +import com.airbnb.epoxy.EpoxyModel +import com.airbnb.epoxy.EpoxyModelClass +import com.airbnb.epoxy.ksp.sample.R + +@EpoxyModelClass +abstract class FooterView : EpoxyModel() { + + @EpoxyAttribute + lateinit var text: String + + override fun getDefaultLayout(): Int = R.layout.footer_view + + override fun bind(view: LinearLayout) { + super.bind(view) + view.findViewById(R.id.footer_text).text = text + } +} diff --git a/epoxy-kspsample/src/main/res/layout/footer_view.xml b/epoxy-kspsample/src/main/res/layout/footer_view.xml new file mode 100644 index 0000000000..8b1c96bcd9 --- /dev/null +++ b/epoxy-kspsample/src/main/res/layout/footer_view.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/BaseProcessor.kt b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/BaseProcessor.kt index db9bfb4850..20e5885933 100644 --- a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/BaseProcessor.kt +++ b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/BaseProcessor.kt @@ -35,7 +35,7 @@ abstract class BaseProcessor(val kspEnvironment: SymbolProcessorEnvironment? = n Asyncable, SymbolProcessor { - val processorName = this@BaseProcessor::class.java.simpleName + private val processorName: String = this@BaseProcessor::class.java.simpleName lateinit var environment: XProcessingEnv private set @@ -287,7 +287,7 @@ abstract class BaseProcessor(val kspEnvironment: SymbolProcessorEnvironment? = n generatedClasses .flatMap { it.attributeInfo } - .mapNotNull { attributeInfo -> + .map { attributeInfo -> if (configManager.requiresHashCode(attributeInfo) && attributeInfo.useInHash && !attributeInfo.ignoreRequireHashCode diff --git a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/EpoxyProcessor.kt b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/EpoxyProcessor.kt index 11aad0cee6..2676a78881 100644 --- a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/EpoxyProcessor.kt +++ b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/EpoxyProcessor.kt @@ -122,13 +122,12 @@ class EpoxyProcessor @JvmOverloads constructor( modelInfo.superClassElement.getAnnotation(EpoxyModelClass::class)?.value?.layout == 0 && modelInfo.boundObjectTypeElement?.hasStyleableAnnotation() == true } + .toSet() timer.markStepCompleted("check for styleable models") styleableModelsToWrite.addAll(styleableModels) - modelInfos.minus(styleableModels).mapNotNull { - writeModel(it, memoizer) - } + modelInfos.minus(styleableModels).map { writeModel(it, memoizer) } styleableModelsToWrite.mapNotNull { modelInfo -> if (tryAddStyleBuilderAttribute(modelInfo, environment, memoizer)) { diff --git a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/ModelViewInfo.kt b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/ModelViewInfo.kt index 81fe3ba076..d671036a40 100644 --- a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/ModelViewInfo.kt +++ b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/ModelViewInfo.kt @@ -75,7 +75,7 @@ class ModelViewInfo( // Only include the interface if the view has one of the interface methods annotated with a prop annotation val interfaceMethods = interfaceElement.getDeclaredMethods() methodsOnView.any { viewMethod -> - viewMethod.hasAnyOf(*ModelViewProcessor.modelPropAnnotationsArray) && + viewMethod.hasAnyAnnotation(*ModelViewProcessor.modelPropAnnotationsArray) && interfaceMethods.any { interfaceMethod -> // To keep this simple we only compare name and ignore parameters, should be close enough viewMethod.name == interfaceMethod.name diff --git a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/ModelViewProcessor.kt b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/ModelViewProcessor.kt index c99145f343..503c4ff5f4 100644 --- a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/ModelViewProcessor.kt +++ b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/ModelViewProcessor.kt @@ -239,9 +239,9 @@ class ModelViewProcessor @JvmOverloads constructor( if (prop is XMethodElement && prop.parameters.isEmpty() && info.viewElement.findOverload( - prop, - 1 - )?.hasAnyOf(*modelPropAnnotationsArray) == true + prop, + 1 + )?.hasAnyAnnotation(*modelPropAnnotationsArray) == true ) { return@mapNotNull null } @@ -468,23 +468,24 @@ class ModelViewProcessor @JvmOverloads constructor( classTypes: List, memoizer: Memoizer ) { - classTypes.getElementsAnnotatedWith(OnVisibilityChanged::class).mapNotNull { visibilityMethod -> - if (!validateVisibilityChangedElement(visibilityMethod, memoizer)) { - return@mapNotNull null - } + classTypes.getElementsAnnotatedWith(OnVisibilityChanged::class) + .mapNotNull { visibilityMethod -> + if (!validateVisibilityChangedElement(visibilityMethod, memoizer)) { + return@mapNotNull null + } - val info = getModelInfoForPropElement(visibilityMethod) - if (info == null) { - logger.logError( - visibilityMethod, - "%s annotation can only be used in classes annotated with %s", - OnVisibilityChanged::class.java, ModelView::class.java - ) - return@mapNotNull null - } + val info = getModelInfoForPropElement(visibilityMethod) + if (info == null) { + logger.logError( + visibilityMethod, + "%s annotation can only be used in classes annotated with %s", + OnVisibilityChanged::class.java, ModelView::class.java + ) + return@mapNotNull null + } - visibilityMethod.expectName to info - }.forEach { (methodName, modelInfo) -> + visibilityMethod.expectName to info + }.forEach { (methodName, modelInfo) -> // Do this after, synchronously, to preserve function ordering in the view. // If there are multiple functions with this annotation this allows them // to be called in predictable order from top to bottom of the class, which @@ -658,7 +659,10 @@ class ModelViewProcessor @JvmOverloads constructor( ) } - private fun validateVisibilityChangedElement(visibilityMethod: XElement, memoizer: Memoizer): Boolean { + private fun validateVisibilityChangedElement( + visibilityMethod: XElement, + memoizer: Memoizer + ): Boolean { contract { returns(true) implies (visibilityMethod is XMethodElement) } @@ -667,7 +671,12 @@ class ModelViewProcessor @JvmOverloads constructor( visibilityMethod, OnVisibilityChanged::class.java, 4, - checkTypeParameters = listOf(TypeName.FLOAT, TypeName.FLOAT, TypeName.INT, TypeName.INT), + checkTypeParameters = listOf( + TypeName.FLOAT, + TypeName.FLOAT, + TypeName.INT, + TypeName.INT + ), memoizer = memoizer ) } diff --git a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/Utils.kt b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/Utils.kt index 4ca9f71c1c..f59ad581b0 100644 --- a/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/Utils.kt +++ b/epoxy-processor/src/main/java/com/airbnb/epoxy/processor/Utils.kt @@ -45,7 +45,7 @@ internal object Utils { @JvmStatic @Throws(EpoxyProcessorException::class) fun throwError(msg: String?, vararg args: Any?) { - throw EpoxyProcessorException(String.format(msg!!, *args)) + throw EpoxyProcessorException(msg!!.format(*args)) } @JvmStatic @@ -53,7 +53,7 @@ internal object Utils { msg: String?, vararg args: Any? ): EpoxyProcessorException { - return EpoxyProcessorException(String.format(msg!!, *args)) + return EpoxyProcessorException(msg!!.format(*args)) } fun buildEpoxyException( @@ -62,7 +62,7 @@ internal object Utils { vararg args: Any? ): EpoxyProcessorException { return EpoxyProcessorException( - message = String.format(msg!!, *args), + message = msg!!.format(*args), element = element ) } @@ -157,7 +157,7 @@ internal object Utils { * Returns the type of the Epoxy model. * * Eg for "class MyModel extends EpoxyModel" it would return TextView. - */ + */ fun getEpoxyObjectType( clazz: XTypeElement, memoizer: Memoizer @@ -285,7 +285,7 @@ internal object Utils { fun capitalizeFirstLetter(original: String?): String? { return if (original == null || original.isEmpty()) { original - } else original.substring(0, 1).toUpperCase() + original.substring(1) + } else original.substring(0, 1).uppercase() + original.substring(1) } @JvmStatic @@ -303,11 +303,11 @@ internal object Utils { return if (!PATTERN_STARTS_WITH_SET.matcher(string).matches()) { string } else string[3].toString() - .toLowerCase() + string.substring(4) + .lowercase() + string.substring(4) } fun toSnakeCase(s: String): String { - return s.replace("([^_A-Z])([A-Z])".toRegex(), "$1_$2").toLowerCase() + return s.replace("([^_A-Z])([A-Z])".toRegex(), "$1_$2").lowercase() } fun getDefaultValue(attributeType: TypeName): String { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05355..7454180f2a 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 a0f7639f7d..e750102e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51583..1b6c787337 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,101 @@ # ############################################################################## -## -## 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='"-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 @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 @@ -98,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 @@ -106,80 +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" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - 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 +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 - 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=`expr $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; +# * $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. +# -# 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" +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 a9f778a7a9..ac1b06f938 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ 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. @@ -54,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% @@ -64,21 +64,6 @@ 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 @@ -86,7 +71,7 @@ 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 10ae1f2c57..7be0f429e6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,7 +15,7 @@ include ':epoxy-modelfactorytest' include ':epoxy-glide-preloader' include ':epoxy-preloadersample' include ':epoxy-viewbinder' -include ':epoxy-compose' -include ':epoxy-composesample' -include ':epoxy-composeinterop-maverickssample' +//include ':epoxy-compose' +//include ':epoxy-composesample' +//include ':epoxy-composeinterop-maverickssample' include ':epoxy-kspsample'