diff --git a/deeplinkdispatch-base/build.gradle b/deeplinkdispatch-base/build.gradle index f77d9780..6827446d 100644 --- a/deeplinkdispatch-base/build.gradle +++ b/deeplinkdispatch-base/build.gradle @@ -1,11 +1,8 @@ apply plugin: 'java' apply plugin: 'kotlin' -apply plugin: 'org.jmailen.kotlinter' - -sourceCompatibility = 11 - +// apply plugin: 'org.jmailen.kotlinter' apply plugin: 'checkstyle' -apply from: '../publishing.gradle' +// apply from: '../publishing.gradle' dependencies { implementation deps.okio @@ -21,3 +18,8 @@ checkstyle { configProperties = ['checkstyle.cache.file': rootProject.file('build/checkstyle.cache')] } +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlin { + jvmToolchain(17) + } +} diff --git a/deeplinkdispatch-processor/build.gradle b/deeplinkdispatch-processor/build.gradle index 28afc25e..7e1d379f 100644 --- a/deeplinkdispatch-processor/build.gradle +++ b/deeplinkdispatch-processor/build.gradle @@ -1,11 +1,8 @@ apply plugin: 'java' apply plugin: 'kotlin' -apply plugin: 'org.jmailen.kotlinter' - -sourceCompatibility = 11 - +// apply plugin: 'org.jmailen.kotlinter' apply plugin: 'checkstyle' -apply from: '../publishing.gradle' +// apply from: '../publishing.gradle' dependencies { implementation project(':deeplinkdispatch-base') @@ -24,7 +21,7 @@ dependencies { testImplementation deps.compileTesting testImplementation deps.compileTestingKsp testImplementation deps.mockk - testImplementation deps.kotlinReflect + testImplementation deps.kotlin.reflect } checkstyle { @@ -34,9 +31,11 @@ checkstyle { } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlin { + jvmToolchain(17) + } kotlinOptions { - jvmTarget = "11" freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" freeCompilerArgs += "-Xopt-in=androidx.room.compiler.processing.ExperimentalProcessingApi" } -} \ No newline at end of file +} diff --git a/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/BaseProcessor.kt b/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/BaseProcessor.kt index 6c8c7214..90298097 100644 --- a/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/BaseProcessor.kt +++ b/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/BaseProcessor.kt @@ -58,6 +58,6 @@ abstract class BaseProcessor(val symbolProcessorEnvironment: SymbolProcessorEnvi abstract fun process( annotations: Set?, environment: XProcessingEnv, - round: XRoundEnv + round: XRoundEnv, ) } diff --git a/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/DeepLinkProcessor.kt b/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/DeepLinkProcessor.kt index c29bd5c2..1c90063d 100644 --- a/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/DeepLinkProcessor.kt +++ b/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/DeepLinkProcessor.kt @@ -136,6 +136,7 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? } else { annotations?.filterAnnotatedAnnotations(DeepLinkSpec::class) ?: emptySet() } + val allDeepLinkAnnotatedElements = customAnnotations.flatMap { round.getElementsAnnotatedWith(it.qualifiedName) } + round.getElementsAnnotatedWith(DEEP_LINK_CLASS) @@ -178,14 +179,14 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? if (e is DeepLinkProcessorException) { logError( element = e.element, - message = e.errorMessage + message = "DeepLinkProcessorException: ${e.errorMessage}" ) } else { // if it is an unexpected crash then the cause can get lost by KAPT unless we manually // catch and print the trace so that it is possible to debug. logError( element = null, - message = "${e.javaClass.simpleName}: ${e.localizedMessage}\n${e.stackTraceToString()}" + message = "Unexpected error: ${e.javaClass.simpleName}: ${e.localizedMessage}\n${e.stackTraceToString()}" ) } } @@ -222,11 +223,13 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? uri = uri, element = element ) + element is XTypeElement && element.isActivity() -> DeepLinkAnnotatedElement.ActivityAnnotatedElement( uri = uri, element = element ) + element is XTypeElement && element.isHandler() -> { verifyHandlerMatchArgs(element, uri) DeepLinkAnnotatedElement.HandlerAnnotatedElement( @@ -234,6 +237,7 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? element = element ) } + else -> error( "Internal error: Elements can only be 'MethodAnnotatedElement', " + "'ActivityAnnotatedElement' or 'HandlerAnnotatedElement'" @@ -252,10 +256,10 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? element: XElement, prefixes: Map> ): List { - return getAllDeeplinkUrIsFromCustomDeepLinksOnElement( - element = element, - prefixesMap = prefixes - ) + (element.getAnnotation(DEEP_LINK_CLASS)?.value?.value?.toList() ?: emptyList()) + val stringList = element.getAnnotation(DEEP_LINK_CLASS)?.getAsStringList("value") + val customUris = getAllDeeplinkUrIsFromCustomDeepLinksOnElement(element, prefixes) + + return customUris + (stringList ?: emptyList()) } private fun verifyCass(classElement: XTypeElement) { @@ -324,13 +328,17 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? errorMessage = "Argument class must be public." ) } - val argsConstructor = argsTypeElement.getConstructors().singleOrNull() ?: run { + + val argsConstructors = argsTypeElement.getConstructors() + + val argsConstructor = argsConstructors.singleOrNull() ?: run { throw DeepLinkProcessorException( element = argsTypeElement, errorMessage = "Argument class for deeplink handler can only have a single constructor" ) } val allArgParameters = argsConstructor.parameters + val allPathParameters = allArgParameters.filterAnnotationType(DeepLinkParamType.Path) val allQueryParameters = allArgParameters.filterAnnotationType(DeepLinkParamType.Query) if (allPathParameters.size + allQueryParameters.size != allArgParameters.size) { @@ -344,7 +352,7 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? val deepLinkUriTemplate = DeepLinkUri.parseTemplate(uriTemplate) val templateHostPathSchemePlaceholders = deepLinkUriTemplate.schemeHostPathPlaceholders val annotatedPathParameterNames = allPathParameters.mapNotNull { - it.getAnnotation(DeeplinkParam::class)?.value?.name + it.getAnnotation(DeeplinkParam::class)?.getAsString("name") }.toSet() val annotatedPathParametersThatAreNotInUrlTemplate = annotatedPathParameterNames.filter { !templateHostPathSchemePlaceholders.contains(it) } @@ -360,14 +368,23 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? private fun List.filterAnnotationType( deepLinkParamType: DeepLinkParamType - ) = - filter { argParameter -> - argParameter.getAllAnnotations().find { annotation -> - annotation.qualifiedName == DeeplinkParam::class.qualifiedName - }?.annotationValues?.any { annotationValue -> - annotationValue.value.toString() == deepLinkParamType.toString() - } ?: false - } + ) = filter { param -> + val deeplinkAnn = param.getAllAnnotations() + .firstOrNull { it.qualifiedName == DeeplinkParam::class.qualifiedName } + ?: return@filter false + + val enumArgValue = deeplinkAnn.annotationValues + .firstOrNull { it.name == "type" } + ?.value + ?.let { v -> + when (v) { + is Enum<*> -> v.name + else -> v.toString().substringAfterLast('.') + } + } + + enumArgValue == deepLinkParamType.name + } private fun verifyObjectElement(element: XTypeElement) { if (!element.isHandler()) { @@ -377,10 +394,12 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? " with @${DEEP_LINK_CLASS.simpleName} or any custom deep link annotation" ) } - if (element.getAllMethods() + + val handlerMethods = element.getAllMethods() .filter { it.name == deepLinkHandlerHandleDeepLinkMethodName && it.parameters.size == 2 } - .count() != 1 - ) { + + + if (handlerMethods.count() != 1) { throw DeepLinkProcessorException( element = element, errorMessage = "More than one method with two parameters and" + @@ -390,7 +409,8 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? } private fun customAnnotationPrefixes(customAnnotations: Set): Map> { - return customAnnotations.map { customAnnotationTypeElement -> + + return customAnnotations.associate { customAnnotationTypeElement -> if (!customAnnotationTypeElement.isAnnotationClass()) { logError( element = customAnnotationTypeElement, @@ -399,7 +419,9 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? } val prefix: Array = customAnnotationTypeElement.getAnnotation(DEEP_LINK_SPEC_CLASS) - ?.let { it.value.prefix } ?: emptyArray() + ?.let { it.getAsStringList("prefix").toTypedArray() } ?: emptyArray() + + if (prefix.hasEmptyOrNullString()) { logError( element = customAnnotationTypeElement, @@ -411,7 +433,7 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? message = "Prefix property cannot be empty" ) customAnnotationTypeElement.type to prefix - }.toMap() + } } private fun verifyAnnotatedType( @@ -443,7 +465,7 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? logError( element = it.value.first().enclosingTypeElement, message = "Only one @DeepLinkHandler annotated element allowed per package!" + - " ${it.key} has ${it.value.joinToString { it.qualifiedName }}.", + " ${it.key} has ${it.value.joinToString { it.qualifiedName }}.", ) } return false @@ -866,11 +888,11 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment? prefixesMap: Map> ): List { return element.findAnnotatedAnnotation().flatMap { customAnnotation -> - val suffixes = customAnnotation.getAsList("value") + val suffixes = customAnnotation.getAsStringList("value") val prefixes = prefixesMap[customAnnotation.type] ?: throw DeepLinkProcessorException( "Unable to find annotation '${customAnnotation.qualifiedName}' you must " + - "update 'deepLink.customAnnotations' within the build.gradle" + "update 'deepLink.customAnnotations' within the build.gradle" ) prefixes.flatMap { prefix -> suffixes.map { suffix -> prefix + suffix } } } diff --git a/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/ProcessorUtils.kt b/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/ProcessorUtils.kt index 9834e652..8023b46c 100644 --- a/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/ProcessorUtils.kt +++ b/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/ProcessorUtils.kt @@ -55,19 +55,11 @@ fun XTypeElement.directlyImplementsInterfaces(fqnList: List): Boolean { } inline fun XAnnotation.getAsList(method: String): List { - val originalList = get>(method) - // In new XProcessing versions List values are wrapped in XAnnotationValue but in old versions - // they are the raw type. - return if (originalList.firstOrNull() is XAnnotationValue) { - // TODO: In the next full release of xprocessing we should be able to safely assume - // the list type is always XAnnotationValue and can remove this if/else. - (originalList as List).map { xAnnotationValue -> - check(xAnnotationValue.value is T) { - "Expected type ${T::class} but got ${xAnnotationValue.value?.javaClass}" - } - xAnnotationValue.value as T - } + val annotationValue = get(method) + return if (annotationValue != null) { + @Suppress("UNCHECKED_CAST") + (annotationValue.value as? List) ?: emptyList() } else { - return originalList + emptyList() } } diff --git a/deeplinkdispatch/build.gradle b/deeplinkdispatch/build.gradle index 9009fdc5..4b1d1050 100644 --- a/deeplinkdispatch/build.gradle +++ b/deeplinkdispatch/build.gradle @@ -1,19 +1,16 @@ apply plugin: 'com.android.library' -sourceCompatibility = 11 - apply plugin: 'checkstyle' apply plugin: 'kotlin-android' -apply from: '../publishing.gradle' -apply plugin: 'org.jmailen.kotlinter' +// apply plugin: 'org.jmailen.kotlinter' dependencies { api project(':deeplinkdispatch-base') implementation deps.okio implementation deps.jsr305 - implementation deps.localBroadcastManager - implementation deps.appCompat + implementation deps.androidx.localBroadcastManager + implementation deps.androidx.appCompat testImplementation deps.mockk testImplementation deps.junit testImplementation deps.assertJ @@ -26,15 +23,23 @@ checkstyle { } android { - compileSdk androidConfig.compileSdkVersion + compileSdk 35 defaultConfig { - minSdk androidConfig.minSdkVersion - targetSdk androidConfig.compileSdkVersion + minSdk 24 + targetSdk 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'proguard-rules.pro' } testOptions { unitTests.returnDefaultValues = true } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlin { + jvmToolchain(17) + } + namespace 'com.airbnb.android.deeplinkdispatch' } diff --git a/deeplinkdispatch/src/main/AndroidManifest.xml b/deeplinkdispatch/src/main/AndroidManifest.xml index 015ce5a6..94cbbcfc 100644 --- a/deeplinkdispatch/src/main/AndroidManifest.xml +++ b/deeplinkdispatch/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - + diff --git a/dependencies.gradle b/dependencies.gradle index b3bd029e..56764a31 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,20 +1,20 @@ def versions = [ - kotlinVersion : '1.8.10', + kotlinVersion : '2.1.21', appCompatVersion : '1.4.1', localBroadcastManagerVersion : '1.1.0', roboelectricVersion : '4.9', benchmarkVersion : '1.0.0', compileTestingVersion : '1.5.0', - kspVersion : '1.8.10-1.0.9', - xProcessorVersion : '2.6.0-alpha01', + kspVersion : '2.1.21-2.0.2', + xProcessorVersion : '2.7.2', mockkVersion : '1.12.3', - ktlintGradlePluginVersion : '3.8.0', + ktlintGradlePluginVersion : '5.1.0', androidXTestingVersion : '1.4.0' ] ext.versions = versions ext.androidConfig = [ - agpVersion : '7.4.0', + agpVersion : '8.12.1', compileSdkVersion : 32, minSdkVersion : 16, targetSdkVersion : 30 diff --git a/gradle.properties b/gradle.properties index e2e41091..5da1b502 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,3 +22,6 @@ android.enableR8.fullMode=true # Publishing configuration for vanniktech/gradle-maven-publish-plugin SONATYPE_HOST=DEFAULT SONATYPE_AUTOMATIC_RELEASE=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3baa851b..2c352119 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 3cc65417..37f853b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Nov 18 16:19:47 PST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/gradlew b/gradlew index 27309d92..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,130 @@ -#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## 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/HEAD/platforms/jvm/plugins-application/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_NAME="Gradle" -APP_BASE_NAME=`basename "$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="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # 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 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,84 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 location of your Java installation." + fi 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*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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 f6d5974e..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +27,29 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused 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= +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% equ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,54 +57,36 @@ 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% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -:init -@rem Get command-line arguments, handling Windows 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 -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/publishing.gradle b/publishing.gradle deleted file mode 100644 index 52c64092..00000000 --- a/publishing.gradle +++ /dev/null @@ -1,34 +0,0 @@ -// Sets up publishing of release artifacts. -// Note: Keep this script in sync across all airbnb open source projects. -apply plugin: 'com.vanniktech.maven.publish' - - -// https://vanniktech.github.io/gradle-maven-publish-plugin/other/ -publishing { - repositories { - maven { - // The "name" value creates a task like `publishAllPublicationsTo[Name]Repository - // In this case, publishAllPublicationsToAirbnbArtifactoryRepository - name = 'airbnbArtifactory' - url = version.toString().endsWith("SNAPSHOT") ? findProperty("ARTIFACTORY_SNAPSHOT_URL") : findProperty("ARTIFACTORY_RELEASE_URL") - credentials { - username = findProperty("ARTIFACTORY_USERNAME") - password = findProperty("ARTIFACTORY_PASSWORD") - } - } - } -} - -mavenPublishing { - if (findProperty("enforceSnapshotVersion").toString().toBoolean() && !findProperty("VERSION_NAME").toString().endsWith("-SNAPSHOT")) { - throw new org.gradle.api.tasks.TaskInstantiationException( - "Cannot publish non snapshot version(${findProperty("VERSION_NAME")}) if 'enforceSnapshotVersion' property is set!" - ) - } - if (findProperty("doNotSignRelease").toString().toBoolean()) { - println("Skipping release signing") - } else { - println("Signing release with gpg") - signAllPublications() - } -} \ No newline at end of file diff --git a/sample-benchmark/build.gradle b/sample-benchmark/build.gradle index 8b41fbbb..090bba49 100644 --- a/sample-benchmark/build.gradle +++ b/sample-benchmark/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' apply plugin: 'androidx.benchmark' apply plugin: 'kotlin-android' -apply plugin: 'org.jmailen.kotlinter' +// apply plugin: 'org.jmailen.kotlinter' android { compileSdk androidConfig.compileSdkVersion @@ -22,9 +22,11 @@ android { } } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(17) } + + namespace 'com.airbnb.deeplinkdispatch.sample.benchmark' } dependencies { diff --git a/sample-benchmark/src/androidTest/AndroidManifest.xml b/sample-benchmark/src/androidTest/AndroidManifest.xml index 37f85166..eef3119a 100644 --- a/sample-benchmark/src/androidTest/AndroidManifest.xml +++ b/sample-benchmark/src/androidTest/AndroidManifest.xml @@ -1,8 +1,7 @@ + xmlns:tools="http://schemas.android.com/tools" >