Skip to content

fix(jackson-databind): update version (pr to master) #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
language: android
# you MUST mention trusty https://docs.travis-ci.com/user/languages/android/
dist: trusty
env:
global:
# These parameters should match the parameters for build tools and sdk versions in the gradle file
Expand Down Expand Up @@ -40,7 +42,7 @@ before_script:
- echo $TRAVIS_TAG
- echo no | android create avd --force -n test -t android-$EMULATOR_API --abi armeabi-v7a
- emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- scripts/android-wait-for-emulator.sh
- adb shell input keyevent 82 &
addons:
srcclr: true
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Optimizely Android X SDK Changelog

## 3.1.1
July 23rd, 2019

### Bug Fixes:
* SourceClear flagged jackson-databind 2.9.8 fixed in 2.9.9.1

## 3.1.0
May 13th, 2019

Expand Down
2 changes: 1 addition & 1 deletion android-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ dependencies {
androidTestImplementation "com.google.dexmaker:dexmaker-mockito:$dexmaker_ver"
androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
androidTestImplementation "com.google.code.gson:gson:$gson_ver"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
}

uploadArchives {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ext {
target_sdk_version = 28
java_core_ver = "3.2.0"
android_logger_ver = "1.3.6"
jacksonversion= "2.9.8"
jacksonversion= "2.9.9.1"
support_annotations_ver = "24.2.1"
junit_ver = "4.12"
mockito_ver = "1.9.5"
Expand Down
2 changes: 1 addition & 1 deletion datafile-handler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {
androidTestImplementation "com.google.dexmaker:dexmaker:$dexmaker_ver"
androidTestImplementation "com.google.dexmaker:dexmaker-mockito:$dexmaker_ver"
androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
}

uploadArchives {
Expand Down
2 changes: 1 addition & 1 deletion event-handler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ dependencies {
androidTestImplementation "com.google.dexmaker:dexmaker:$dexmaker_ver"
androidTestImplementation "com.google.dexmaker:dexmaker-mockito:$dexmaker_ver"
androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
}

uploadArchives {
Expand Down
32 changes: 32 additions & 0 deletions scripts/android-wait-for-emulator.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash

# Originally written by Ralf Kistner <ralf@embarkmobile.com>, but placed in the public domain

set +e

bootanim=""
failcounter=0
#timeout_in_sec=360 # 6 minutes
timeout_in_sec=900 # 15 minutes
echo "Waiting for emulator to start"
until [[ "$bootanim" =~ "stopped" ]]; do
bootanim=`adb -e shell getprop init.svc.bootanim 2>&1 &`
#echo bootanim=\`$bootanim\`
if [[ "$bootanim" =~ "device not found" || "$bootanim" =~ "device offline"
|| "$bootanim" =~ "running" || "$bootanim" =~ "error: no emulators found" ]]; then
let "failcounter += 5"
echo -n "."
if [[ $failcounter -gt timeout_in_sec ]]; then
echo "Timeout ($timeout_in_sec seconds) reached; failed to start emulator"
exit 1
fi
else
if [[ ! "$bootanim" =~ "stopped" ]]; then
echo "unexpected behavior from (adb -e shell getprop init.svc.bootanim): $bootanim"
exit 1
fi
fi
sleep 5
done

echo "Emulator is ready (took $failcounter seconds)"
2 changes: 1 addition & 1 deletion shared/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ dependencies {
androidTestImplementation "com.google.dexmaker:dexmaker:$dexmaker_ver"
androidTestImplementation "com.google.dexmaker:dexmaker-mockito:$dexmaker_ver"
androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
}

uploadArchives {
Expand Down
4 changes: 2 additions & 2 deletions test-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dependencies {
// https://mvnrepository.com/artifact/org.slf4j/slf4j-android
implementation group: 'org.slf4j', name: 'slf4j-android', version: '1.7.25'
// EXAMPLE REPLACE gson json parsing with jackson-databind json parsing.
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "$jacksonversion"

testImplementation "junit:junit:$junit_ver"
testImplementation "org.mockito:mockito-core:$mockito_ver"
Expand All @@ -68,5 +68,5 @@ dependencies {
// androidTestImplementation 'com.optimizely.ab:android-sdk:1.0.0'
androidTestImplementation project(':android-sdk')
androidTestImplementation project(path: ':shared')
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
}
2 changes: 1 addition & 1 deletion user-profile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {
androidTestImplementation "com.google.dexmaker:dexmaker:$dexmaker_ver"
androidTestImplementation "com.google.dexmaker:dexmaker-mockito:$dexmaker_ver"
androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
}

uploadArchives {
Expand Down