diff --git a/analyticskit/build.gradle b/analyticskit/build.gradle index b761ac1..118db92 100644 --- a/analyticskit/build.gradle +++ b/analyticskit/build.gradle @@ -47,10 +47,10 @@ android { } dependencies { - api "androidx.annotation:annotation:1.2.0" + api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion" api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" - testImplementation 'junit:junit:4.12' + testImplementation "junit:junit:$rootProject.ext.junit_version" testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion" testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion" diff --git a/build.gradle b/build.gradle index c397fc4..769db4c 100644 --- a/build.gradle +++ b/build.gradle @@ -16,17 +16,16 @@ buildscript { ext { - kotlin_version = '1.5.10' + kotlin_version = '1.7.0' } repositories { google() - jcenter() - maven { url 'https://maven.fabric.io/public' } + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' - classpath 'com.google.gms:google-services:4.3.8' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10" + classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.google.gms:google-services:4.3.13' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0" } } @@ -37,9 +36,8 @@ plugins { allprojects { repositories { google() - jcenter() + mavenCentral() maven { url "https://jitpack.io" } - maven { url 'https://maven.fabric.io/public' } } } @@ -53,15 +51,16 @@ ext { versionName = "$VERSION_NAME" // dependency versions + annotationsVersion = "1.4.0" assertjVersion = "3.14.0" - kotlinVersion = "1.5.10" + kotlinVersion = "1.7.0" mockitoVersion = "2.23.0" mockitoKotlinVersion = "2.2.0" analytics_kit = ':analyticskit' /** Unit Testing Dependency Versions **/ - junit_version = "4.12" + junit_version = "4.13.2" } task clean(type: Delete) { diff --git a/firebase-provider/build.gradle b/firebase-provider/build.gradle index 594b857..008ec48 100644 --- a/firebase-provider/build.gradle +++ b/firebase-provider/build.gradle @@ -53,12 +53,11 @@ android { dependencies { implementation project(path: rootProject.ext.analytics_kit) api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" - api 'androidx.annotation:annotation:1.2.0' - api "androidx.annotation:annotation:1.2.0" - compileOnly 'com.google.firebase:firebase-analytics:19.0.0' + api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion" + compileOnly 'com.google.firebase:firebase-analytics:21.1.0' - testImplementation 'com.google.firebase:firebase-analytics:19.0.0' - testImplementation 'junit:junit:4.12' + testImplementation 'com.google.firebase:firebase-analytics:21.1.0' + testImplementation "junit:junit:$rootProject.ext.junit_version" testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion" diff --git a/flurry-provider/build.gradle b/flurry-provider/build.gradle index eb6fa5d..5ee90d2 100644 --- a/flurry-provider/build.gradle +++ b/flurry-provider/build.gradle @@ -53,9 +53,10 @@ android { dependencies { implementation project(path: rootProject.ext.analytics_kit) api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" - api "androidx.annotation:annotation:1.2.0" - implementation 'com.flurry.android:analytics:12.13.0' + api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion" + compileOnly 'com.flurry.android:analytics:13.3.0' + testImplementation 'com.flurry.android:analytics:13.3.0' testImplementation "junit:junit:$rootProject.ext.junit_version" testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion" testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" diff --git a/google-analytics-provider/build.gradle b/google-analytics-provider/build.gradle index 909206b..0ef4b0e 100644 --- a/google-analytics-provider/build.gradle +++ b/google-analytics-provider/build.gradle @@ -49,7 +49,7 @@ android { dependencies { implementation project(path: rootProject.ext.analytics_kit) api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" - api "androidx.annotation:annotation:1.2.0" + api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion" compileOnly 'com.google.android.gms:play-services-analytics:17.0.0' testImplementation 'com.google.android.gms:play-services-analytics:17.0.0' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..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 442d913..ae04661 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-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 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 107acd3..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@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 +@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 diff --git a/graylog-provider/build.gradle b/graylog-provider/build.gradle index f679f15..5d32d15 100644 --- a/graylog-provider/build.gradle +++ b/graylog-provider/build.gradle @@ -52,9 +52,9 @@ android { dependencies { implementation project(path: rootProject.ext.analytics_kit) api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" - compileOnly 'com.squareup.okhttp3:okhttp:4.9.1' + compileOnly 'com.squareup.okhttp3:okhttp:4.9.3' - api "androidx.annotation:annotation:1.2.0" + api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion" testImplementation "junit:junit:$rootProject.ext.junit_version" testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion" diff --git a/intercom-provider/build.gradle b/intercom-provider/build.gradle index a0828d9..bd005bd 100644 --- a/intercom-provider/build.gradle +++ b/intercom-provider/build.gradle @@ -53,10 +53,10 @@ android { dependencies { implementation project(path: rootProject.ext.analytics_kit) api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" - api "androidx.annotation:annotation:1.2.0" - compileOnly 'io.intercom.android:intercom-sdk-base:10.6.1' + api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion" + compileOnly 'io.intercom.android:intercom-sdk-base:12.0.0' - testImplementation 'io.intercom.android:intercom-sdk-base:10.6.1' + testImplementation 'io.intercom.android:intercom-sdk-base:12.0.0' testImplementation "junit:junit:$rootProject.ext.junit_version" testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion" testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" diff --git a/kissmetrics-provider/build.gradle b/kissmetrics-provider/build.gradle index 44e664f..4fea906 100644 --- a/kissmetrics-provider/build.gradle +++ b/kissmetrics-provider/build.gradle @@ -52,14 +52,17 @@ android { } dependencies { - implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.core:core-ktx:1.8.0' implementation project(path: rootProject.ext.analytics_kit) api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" - api "androidx.annotation:annotation:1.2.0" - compileOnly 'com.kissmetrics.sdk:KISSmetricsSDK:2.3.1' + api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion" +// compileOnly 'com.kissmetrics.sdk:KISSmetricsSDK:2.3.1' // Not working + // workaround until KISSmetrics migrates their SDK off jcenter(); version 2.3.1 + compileOnly 'com.github.jahunt1:KISSmetrics-Android-SDK:gradle-wrapper-SNAPSHOT' - testImplementation 'com.kissmetrics.sdk:KISSmetricsSDK:2.3.1' + // workaround until KISSmetrics migrates their SDK off jcenter(); version 2.3.1 + testImplementation 'com.github.jahunt1:KISSmetrics-Android-SDK:gradle-wrapper-SNAPSHOT' testImplementation "junit:junit:$rootProject.ext.junit_version" testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion" testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" diff --git a/mixpanel-provider/build.gradle b/mixpanel-provider/build.gradle index de276a5..a450691 100644 --- a/mixpanel-provider/build.gradle +++ b/mixpanel-provider/build.gradle @@ -53,11 +53,11 @@ android { dependencies { implementation project(path: rootProject.ext.analytics_kit) api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion" - api "androidx.annotation:annotation:1.2.0" - implementation 'com.mixpanel.android:mixpanel-android:5.9.1' + api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion" + implementation 'com.mixpanel.android:mixpanel-android:6.5.2' compileOnly 'com.google.android.gms:play-services-gcm:17.0.0' - testImplementation 'com.mixpanel.android:mixpanel-android:5.9.1' + testImplementation 'com.mixpanel.android:mixpanel-android:6.5.2' testImplementation "junit:junit:$rootProject.ext.junit_version" testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion" testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion"