diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f0bed8..6feec8c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Android-ci
+name: Android CI
on:
push:
@@ -14,11 +14,28 @@ permissions:
jobs:
build:
runs-on: ubuntu-latest
- container:
- image: docker://fabernovel/android:api-31-v1.6.0
steps:
- uses: actions/checkout@v4
- - name: Build with Gradle
- run: ./gradlew dependencies
- - name: Test
- run: ./gradlew test
+ - name: Set up JDK 17
+ uses: actions/setup-java@v4
+ with:
+ distribution: temurin
+ java-version: '17'
+ cache: gradle
+ - name: Set up Android SDK
+ uses: android-actions/setup-android@v3
+ - name: Install Android SDK packages
+ run: sdkmanager "platform-tools" "platforms;android-36" "build-tools;36.0.0"
+ - name: Lint
+ run: ./gradlew :sift:lint :hello-sift:lintDebug
+ - name: Build and test
+ run: ./gradlew clean test :sift:assembleRelease :hello-sift:assembleDebug
+ - name: Connected smoke test (hello-sift)
+ uses: reactivecircus/android-emulator-runner@v2
+ with:
+ api-level: 29
+ arch: x86_64
+ profile: Nexus 6
+ disable-animations: true
+ emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+ script: ./gradlew :hello-sift:connectedDebugAndroidTest
diff --git a/.github/workflows/publish2sonatype.yml b/.github/workflows/publish2sonatype.yml
index d801a76..897c4eb 100644
--- a/.github/workflows/publish2sonatype.yml
+++ b/.github/workflows/publish2sonatype.yml
@@ -11,27 +11,29 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
- uses: actions/checkout@v3
- - name: Set up JDK 8
- uses: actions/setup-java@v3
+ uses: actions/checkout@v4
+ - name: Set up JDK 17
+ uses: actions/setup-java@v4
with:
- java-version: '8.0.362'
- distribution: 'zulu'
+ distribution: temurin
+ java-version: '17'
+ cache: gradle
+ - name: Set up Android SDK
+ uses: android-actions/setup-android@v3
+ - name: Install Android SDK packages
+ run: sdkmanager "platform-tools" "platforms;android-36" "build-tools;36.0.0"
- name: Prepare gradle.properties
run: |
cd sift
- echo "$(pwd)"
echo -e "${{ secrets.SECRING }}" | base64 -d > ./secring.gpg
- echo "$(ls -la)"
echo "signing.keyId=${{ secrets.KEYID }}" >> ./gradle.properties
echo "signing.password=${{ secrets.PASS }}" >> ./gradle.properties
echo "signing.secretKeyRingFile=$(pwd)/secring.gpg" >> ./gradle.properties
echo "NEXUS_USERNAME=${{ secrets.SUSER }}" >> ./gradle.properties
echo "NEXUS_PASSWORD=${{ secrets.SPASSWORD }}" >> ./gradle.properties
- echo "$(ls -la)"
- name: Sonatype Publish
run: |
- ./gradlew uploadArchives
+ ./gradlew :sift:publishReleasePublicationToSonatypeRepository
BEARER=$(printf "${{ secrets.SUSER }}:${{ secrets.SPASSWORD }}" | base64)
curl --request POST \
--verbose \
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e09b68d..e2307c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,32 @@
-# Change Log
+# Change Log
+
+## [1.3.1] - 2026-03-03
+
+### Breaking Changes
+- Generated event models now rely on getters/setters. Direct field access in `com.sift.api.representations` may be source-incompatible and should be migrated.
+
+### Changed
+- Migrated build system to Gradle 8.13 and Android Gradle Plugin 8.13.2.
+- Refreshed the full Gradle wrapper set (`gradle-wrapper.properties`, `gradlew`, `gradlew.bat`, `gradle-wrapper.jar`).
+- Updated Android SDK levels to compileSdk 36 / targetSdk 36 while keeping `minSdk 19`.
+- Added Java toolchain configuration to compile with JDK 17 and set project JVM args for modern Gradle runs.
+- Updated core and test dependencies (Gson, AppCompat, JUnit, Mockito, WireMock, AndroidX Test).
+- Migrated publishing flow to `maven-publish` and Sonatype publish tasks.
+- Updated CI and publishing GitHub Actions workflows to JDK 17 + Android SDK API 36 and removed debug-only workflow output.
+- Added a Compatibility section to README.
+
+### Removed
+- Removed `jcenter()` repository usage and legacy repository declarations.
+- Removed explicit `androidTest` dependency on `androidx.annotation`.
+- Removed legacy `uploadArchives` compatibility task.
+- Removed legacy AWS Device Farm Gradle integration (`keys.gradle` / `devicefarm` hook in sample app).
+
+### Fixed
+- Fixed Gradle/AGP migration issues (new DSL requirements, namespace setup, manifest package migration, and modern publishing setup).
+- Fixed `jsonschema2pojo` migration incompatibilities (`existingJavaType` schema usage and generated model integration updates).
+- Updated SDK source and tests to generated-model accessors.
+- Reduced noisy non-Android unit test logs for missing `getprop` / `mount` commands.
+- Added Mockito Java agent setup for unit tests to avoid JDK dynamic agent self-attach warnings.
## [1.3.0] - 2023-01-30
diff --git a/README.md b/README.md
index 33a47bd..c262235 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
- [Introduction](#introduction)
- [Installation](#installation)
+- [Compatibility](#compatibility)
- [Integration](#integration)
- [Application Integration](#application)
- [Custom Integration](#custom)
@@ -46,6 +47,21 @@ android {
}
```
+
+## Compatibility
+
+- `minSdk` is `19` (Android 4.4+).
+- Generated classes under `com.sift.api.representations` should be accessed via getters/setters.
+- If your integration directly references generated model fields, migrate to accessors:
+
+```java
+// Before
+event.userId = "SOME_USER_ID";
+
+// After
+event.setUserId("SOME_USER_ID");
+```
+
## Integrating Sift
diff --git a/build.gradle b/build.gradle
index 9b20ac6..669931e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,30 +1,11 @@
// Build file of Sift Science Android SDK.
-buildscript {
- repositories {
- jcenter()
- mavenCentral()
- maven {
- url 'https://maven.google.com/'
- name 'Google'
- }
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:4.0.2'
- classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.1'
- }
+plugins {
+ id 'com.android.application' version '8.13.2' apply false
+ id 'com.android.library' version '8.13.2' apply false
+ id 'org.jsonschema2pojo' version '1.3.3' apply false
}
-allprojects {
- repositories {
- jcenter()
- maven {
- url 'https://maven.google.com/'
- name 'Google'
- }
- }
-}
-
-task clean(type: Delete) {
- delete rootProject.buildDir
+tasks.register('clean', Delete) {
+ delete rootProject.layout.buildDirectory
}
diff --git a/gradle.properties b/gradle.properties
index 6a48bc5..8c9ad3b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,8 +17,8 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-VERSION_NAME=1.3.0
-VERSION_CODE=25
+VERSION_NAME=1.3.1
+VERSION_CODE=26
GROUP=com.siftscience
@@ -34,4 +34,5 @@ POM_DEVELOPER_ID=garylee1
POM_DEVELOPER_NAME=Gary Lee
android.useAndroidX=true
-android.enableJetifier=true
+
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
new file mode 100644
index 0000000..c9bb228
--- /dev/null
+++ b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/0b98aec810298c2c1d7fdac5dac37910/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/9c55677aff3966382f3d853c0959bfb2/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/248ffb1098f61659502d0c09aa348294/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/056dc25d3b9d168ede8b94d3d2f99942/redirect
+toolchainVendor=JETBRAINS
+toolchainVersion=21
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372ae..9bbc975 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 0942cba..ed4c299 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Oct 14 10:29:10 IST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/gradlew b/gradlew
index 9d82f78..faf9300 100755
--- a/gradlew
+++ b/gradlew
@@ -1,74 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# 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/.
+#
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# 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\n' "$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
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -77,84 +132,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" ] ; 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, 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 aec9973..9b42019 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
@@ -8,26 +26,30 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+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="-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 Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
-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/hello-sift/build.gradle b/hello-sift/build.gradle
index 0f953ce..1c1a73b 100644
--- a/hello-sift/build.gradle
+++ b/hello-sift/build.gradle
@@ -1,58 +1,44 @@
-apply plugin: 'com.android.application'
+plugins {
+ id 'com.android.application'
+}
android {
- compileSdkVersion 31
- buildToolsVersion "30.0.0"
+ namespace = 'siftscience.android.hellosift'
+ compileSdk = 36
defaultConfig {
- applicationId "siftscience.android.hellosift"
- minSdkVersion 19
- targetSdkVersion 31
- versionCode 1
- versionName '0.0.1'
- testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+ applicationId = 'siftscience.android.hellosift'
+ minSdk = 19
+ targetSdk = 36
+ versionCode = 1
+ versionName = '0.0.1'
+ testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
release {
- minifyEnabled true
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
-
- // TODO: currently used for testing on device. may need to remove before release
- debug {
- debuggable true
+ minifyEnabled = true
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
- packagingOptions {
- exclude 'META-INF/DEPENDENCIES'
- exclude 'META-INF/NOTICE'
- exclude 'META-INF/LICENSE'
- exclude 'META-INF/LICENSE.txt'
- exclude 'META-INF/NOTICE.txt'
+ packaging {
+ resources {
+ excludes += [
+ 'META-INF/DEPENDENCIES',
+ 'META-INF/NOTICE',
+ 'META-INF/LICENSE',
+ 'META-INF/LICENSE.txt',
+ 'META-INF/NOTICE.txt'
+ ]
+ }
}
}
dependencies {
- implementation 'androidx.appcompat:appcompat:1.2.0'
+ implementation 'androidx.appcompat:appcompat:1.6.1'
implementation project(':sift')
- androidTestImplementation 'androidx.annotation:annotation:1.1.0'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test:rules:1.3.0'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-}
-
-if (project.file('../keys.gradle').exists()) {
- apply plugin: 'devicefarm'
- apply from: '../keys.gradle'
- devicefarm {
- projectName 'sift-android-private'
- devicePool 'big pool'
- authentication {
- accessKey a
- secretKey s
- }
- }
+ androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+ androidTestImplementation 'androidx.test:rules:1.6.1'
}
diff --git a/hello-sift/src/main/AndroidManifest.xml b/hello-sift/src/main/AndroidManifest.xml
index 22f5464..14e4c75 100644
--- a/hello-sift/src/main/AndroidManifest.xml
+++ b/hello-sift/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-
+
- uploadArchives {
- repositories {
- mavenDeployer {
- beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+def isSigningRequiredForCurrentTaskGraph() {
+ return gradle.taskGraph.allTasks.any { task ->
+ def taskName = task.name.toLowerCase()
+ def taskPath = task.path.toLowerCase()
- pom.groupId = GROUP
- pom.artifactId = POM_ARTIFACT_ID
- pom.version = VERSION_NAME
+ taskName == 'publish' ||
+ taskName == 'publishreleasepublicationtosonatyperepository' ||
+ (taskName.startsWith('publish') && taskPath.contains('sonatype'))
+ }
+}
- repository(url: getReleaseRepositoryUrl()) {
- authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
- }
+publishing {
+ repositories {
+ maven {
+ name = 'sonatype'
+ url = uri(getReleaseRepositoryUrl())
+ credentials {
+ username = getRepositoryUsername()
+ password = getRepositoryPassword()
+ }
+ }
+ }
+ publications {
+ release(MavenPublication) {
+ groupId = GROUP
+ artifactId = POM_ARTIFACT_ID
+ version = VERSION_NAME
- pom.project {
- name POM_NAME
- packaging POM_PACKAGING
- description POM_DESCRIPTION
- url POM_URL
+ pom {
+ name = POM_NAME
+ description = POM_DESCRIPTION
+ url = POM_URL
- scm {
- url POM_SCM_URL
- connection POM_SCM_CONNECTION
- developerConnection POM_SCM_DEV_CONNECTION
- }
+ scm {
+ url = POM_SCM_URL
+ connection = POM_SCM_CONNECTION
+ developerConnection = POM_SCM_DEV_CONNECTION
+ }
- licenses {
- license {
- name POM_LICENCE_NAME
- url POM_LICENCE_URL
- distribution POM_LICENCE_DIST
- }
+ licenses {
+ license {
+ name = POM_LICENCE_NAME
+ url = POM_LICENCE_URL
+ distribution = POM_LICENCE_DIST
}
+ }
- developers {
- developer {
- id POM_DEVELOPER_ID
- name POM_DEVELOPER_NAME
- }
+ developers {
+ developer {
+ id = POM_DEVELOPER_ID
+ name = POM_DEVELOPER_NAME
}
}
}
}
}
+}
- signing {
- required { gradle.taskGraph.hasTask("uploadArchives") }
- sign configurations.archives
- }
-
- task androidSourcesJar(type: Jar) {
- classifier = 'sources'
- from android.sourceSets.main.java.sourceFiles
+afterEvaluate {
+ def releaseComponent = components.findByName('release')
+ if (releaseComponent != null) {
+ publishing.publications.named('release', MavenPublication) {
+ from releaseComponent
+ }
}
+}
- artifacts {
- archives androidSourcesJar
- }
+signing {
+ required = { isSigningRequiredForCurrentTaskGraph() }
+ sign publishing.publications.release
}
+
diff --git a/sift/src/main/AndroidManifest.xml b/sift/src/main/AndroidManifest.xml
index 9431727..8e3f385 100644
--- a/sift/src/main/AndroidManifest.xml
+++ b/sift/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/sift/src/main/java/siftscience/android/DevicePropertiesCollector.java b/sift/src/main/java/siftscience/android/DevicePropertiesCollector.java
index e8d6375..58b38a5 100644
--- a/sift/src/main/java/siftscience/android/DevicePropertiesCollector.java
+++ b/sift/src/main/java/siftscience/android/DevicePropertiesCollector.java
@@ -89,7 +89,7 @@ public void collect() {
this.sift.appendDevicePropertiesEvent(
new MobileEventJson()
.withAndroidDeviceProperties(deviceProperties)
- .withInstallationId(deviceProperties.androidId)
+ .withInstallationId(deviceProperties.getAndroidId())
.withTime(Time.now()));
}
@@ -252,7 +252,11 @@ private String[] propertiesReader() {
try {
inputstream = Runtime.getRuntime().exec("getprop").getInputStream();
} catch (IOException e) {
- Log.e(TAG, "Error reading properties", e);
+ if (isCommandMissing(e)) {
+ Log.d(TAG, "getprop is unavailable in this runtime");
+ } else {
+ Log.e(TAG, "Error reading properties", e);
+ }
}
if (inputstream == null) {
return new String[0];
@@ -276,7 +280,11 @@ private String[] mountReader() {
try {
inputstream = Runtime.getRuntime().exec("mount").getInputStream();
} catch (IOException e) {
- Log.e(TAG, "Error reading mount", e);
+ if (isCommandMissing(e)) {
+ Log.d(TAG, "mount is unavailable in this runtime");
+ } else {
+ Log.e(TAG, "Error reading mount", e);
+ }
}
if (inputstream == null) {
return new String[0];
@@ -290,4 +298,9 @@ private String[] mountReader() {
}
return allPaths.split("\n");
}
+
+ private boolean isCommandMissing(IOException exception) {
+ String message = exception.getMessage();
+ return message != null && message.contains("No such file or directory");
+ }
}
diff --git a/sift/src/main/java/siftscience/android/Queue.java b/sift/src/main/java/siftscience/android/Queue.java
index 267bb2e..6482cc1 100644
--- a/sift/src/main/java/siftscience/android/Queue.java
+++ b/sift/src/main/java/siftscience/android/Queue.java
@@ -151,13 +151,13 @@ Config getConfig() {
void append(@NonNull MobileEventJson event) {
long now = Time.now();
- if (event.userId == null) {
- event.userId = userIdProvider.getUserId();
+ if (event.getUserId() == null) {
+ event.setUserId(userIdProvider.getUserId());
}
if (this.config.acceptSameEventAfter > 0 &&
state.lastEvent != null &&
- now < state.lastEvent.time + this.config.acceptSameEventAfter &&
+ now < state.lastEvent.getTime() + this.config.acceptSameEventAfter &&
Utils.eventsAreBasicallyEqual(state.lastEvent, event)) {
Log.d(TAG, String.format("Drop duplicate event: %s", event.toString()));
return;
diff --git a/sift/src/main/java/siftscience/android/Utils.java b/sift/src/main/java/siftscience/android/Utils.java
index ef12397..76988b5 100644
--- a/sift/src/main/java/siftscience/android/Utils.java
+++ b/sift/src/main/java/siftscience/android/Utils.java
@@ -19,10 +19,10 @@ public static boolean eventsAreBasicallyEqual(MobileEventJson first,
// KLUDGE: jsonschema2pojo doesn't generate copy constructors, so back up one time,
// override it, then restore it.
- Long firstTime = first.time;
- first.time = second.time;
+ Long firstTime = first.getTime();
+ first.setTime(second.getTime());
boolean result = first.equals(second);
- first.time = firstTime;
+ first.setTime(firstTime);
return result;
}
diff --git a/sift/src/main/json/list_request.yaml b/sift/src/main/json/list_request.yaml
index ab6372c..81aa4c9 100644
--- a/sift/src/main/json/list_request.yaml
+++ b/sift/src/main/json/list_request.yaml
@@ -12,5 +12,5 @@ properties:
type: array
items:
type: object
- javaType: java.lang.Object
+ existingJavaType: java.lang.Object
additionalProperties: false
diff --git a/sift/src/main/json/mobile_event.yaml b/sift/src/main/json/mobile_event.yaml
index a360b30..b811ba6 100644
--- a/sift/src/main/json/mobile_event.yaml
+++ b/sift/src/main/json/mobile_event.yaml
@@ -27,11 +27,11 @@ properties:
scope: public
fields:
type: object
- javaType: java.util.Map
+ existingJavaType: java.util.Map
scope: public
device_properties:
type: object
- javaType: java.util.Map
+ existingJavaType: java.util.Map
scope: public
android_device_properties:
diff --git a/sift/src/test/java/siftscience/android/EventTest.java b/sift/src/test/java/siftscience/android/EventTest.java
index e20c7b8..9f81622 100644
--- a/sift/src/test/java/siftscience/android/EventTest.java
+++ b/sift/src/test/java/siftscience/android/EventTest.java
@@ -49,6 +49,6 @@ public void testEventToJson() throws IOException {
MobileEventJson actual = Sift.GSON.fromJson(Sift.GSON.toJson(event), MobileEventJson.class);
assertTrue(Utils.eventsAreBasicallyEqual(event, actual));
- assertEquals(event.time, actual.time);
+ assertEquals(event.getTime(), actual.getTime());
}
}
diff --git a/sift/src/test/java/siftscience/android/QueueTest.java b/sift/src/test/java/siftscience/android/QueueTest.java
index a8a1a01..caabcfb 100644
--- a/sift/src/test/java/siftscience/android/QueueTest.java
+++ b/sift/src/test/java/siftscience/android/QueueTest.java
@@ -21,7 +21,8 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
public class QueueTest {
@@ -80,7 +81,7 @@ public void testAppend() throws IOException {
queue.append(event1);
queue.append(event2);
- verifyZeroInteractions(uploadRequester);
+ verifyNoMoreInteractions(uploadRequester);
String archive = queue.archive();
assertEquals(Arrays.asList(event1, event2), queue.flush());
@@ -125,7 +126,7 @@ public void testAcceptSameEventAfter() throws IOException {
)
.withTime(Time.currentTime)
.withUserId("gary");
- assertTrue(Time.currentTime == event1.time);
+ assertTrue(Time.currentTime == event1.getTime());
queue.append(event1);
Time.currentTime++;
@@ -137,10 +138,10 @@ public void testAcceptSameEventAfter() throws IOException {
)
.withTime(Time.currentTime)
.withUserId("gary");
- assertTrue(Time.currentTime == event1.time);
+ assertTrue(Time.currentTime == event1.getTime());
queue.append(event1);
- verifyZeroInteractions(uploadRequester);
+ verifyNoInteractions(uploadRequester);
assertEquals(Collections.singletonList(event0), queue.flush());
@@ -153,10 +154,10 @@ public void testAcceptSameEventAfter() throws IOException {
)
.withTime(Time.currentTime)
.withUserId("gary");
- assertTrue(Time.currentTime == event1.time);
+ assertTrue(Time.currentTime == event1.getTime());
queue.append(event1);
- verifyZeroInteractions(uploadRequester);
+ verifyNoInteractions(uploadRequester);
assertEquals(Collections.singletonList(event1), queue.flush());
}
@@ -178,7 +179,7 @@ public void testUploadWhenMoreThan() throws IOException {
)
.withTime(1000L);
- verifyZeroInteractions(uploadRequester);
+ verifyNoInteractions(uploadRequester);
// Always upload the first event
queue.append(event);
@@ -296,7 +297,7 @@ public void testUploadEventWithoutWait() throws IOException {
// Should not have uploaded the second event (not stale enough)
queue.append(event);
- verifyZeroInteractions(uploadRequester);
+ verifyNoInteractions(uploadRequester);
}
@Test
diff --git a/sift/src/test/java/siftscience/android/SiftTest.java b/sift/src/test/java/siftscience/android/SiftTest.java
index e62ad17..a9f07a2 100644
--- a/sift/src/test/java/siftscience/android/SiftTest.java
+++ b/sift/src/test/java/siftscience/android/SiftTest.java
@@ -39,9 +39,9 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -392,13 +392,13 @@ public void testUnsetUserId() throws Exception {
// Append twice because the first one gets uploaded and flushed
sift.getQueue(SiftImpl.APP_STATE_QUEUE_IDENTIFIER).append(new MobileEventJson());
MobileEventJson event = sift.getQueue(SiftImpl.APP_STATE_QUEUE_IDENTIFIER).flush().get(0);
- assertEquals("gary", event.userId);
+ assertEquals("gary", event.getUserId());
sift.unsetUserId();
sift.getQueue(SiftImpl.APP_STATE_QUEUE_IDENTIFIER).append(new MobileEventJson());
event = sift.getQueue(SiftImpl.APP_STATE_QUEUE_IDENTIFIER).flush().get(0);
- assertNull(event.userId);
+ assertNull(event.getUserId());
}
@Test
@@ -517,7 +517,7 @@ public void testAppStateCollector() {
assertEquals(1, eventList.size());
MobileEventJson event = eventList.get(0);
- assertEquals(Sift.SDK_VERSION, event.androidAppState.sdkVersion);
+ assertEquals(Sift.SDK_VERSION, event.getAndroidAppState().getSdkVersion());
}
@Test
@@ -574,9 +574,9 @@ public void testAppStateCollectorWithMockLocation() {
assertEquals(1, eventList.size());
MobileEventJson event = eventList.get(0);
- assertNotNull(event.androidAppState.location);
+ assertNotNull(event.getAndroidAppState().getLocation());
- assertEquals(mockLocationJson, event.androidAppState.location);
+ assertEquals(mockLocationJson, event.getAndroidAppState().getLocation());
}
@Test
diff --git a/sift/src/test/java/siftscience/android/UploaderTest.java b/sift/src/test/java/siftscience/android/UploaderTest.java
index 7b84386..859a7ca 100644
--- a/sift/src/test/java/siftscience/android/UploaderTest.java
+++ b/sift/src/test/java/siftscience/android/UploaderTest.java
@@ -23,8 +23,8 @@
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;