Skip to content

Commit 4fea419

Browse files
author
Josh Deffibaugh
committed
Reverts dexmaker versionand changes mockito version
1 parent 36e4cb7 commit 4fea419

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ ext {
5656
android_logger_ver = "1.3.1"
5757
support_annotations_ver = "24.2.1"
5858
junit_ver = "4.12"
59-
mockito_ver = "1.10.19"
59+
mockito_ver = "1.9.5"
6060
support_test_runner_ver = "0.5"
61-
dexmaker_ver = "1.1"
61+
dexmaker_ver = "1.2"
6262
espresso_ver = "2.2.2"
6363
gson_ver = "2.6.2"
6464
group_id = "com.optimizely.ab"

test-app/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android {
55
buildToolsVersion build_tools_version
66

77
defaultConfig {
8-
minSdkVersion 19
8+
minSdkVersion 14
99
targetSdkVersion target_sdk_version
1010
versionCode 1
1111
versionName "1.0"
@@ -28,16 +28,17 @@ android {
2828

2929
dependencies {
3030
// Includes SST Java core, event handler, and user experiment record
31-
// compile project(':android-sdk')
32-
compile 'com.optimizely.ab:android-sdk:0.2.0'
31+
compile project(':android-sdk')
32+
// compile 'com.optimizely.ab:android-sdk:0.2.0'
3333
compile 'com.android.support:appcompat-v7:24.2.1'
3434
compile 'com.android.support:design:24.2.1'
35+
compile 'com.fasterxml.jackson.core:jackson-annotations:2.7.1'
3536

3637
testCompile "junit:junit:$junit_ver"
3738
testCompile "org.mockito:mockito-core:$mockito_ver"
3839
testCompile "com.noveogroup.android:android-logger:$android_logger_ver"
39-
testCompile 'com.optimizely.ab:android-sdk:0.2.0'
40-
// testCompile project(':android-sdk')
40+
// testCompile 'com.optimizely.ab:android-sdk:0.2.0'
41+
testCompile project(':android-sdk')
4142

4243
androidTestCompile("com.android.support.test:runner:$support_test_runner_ver")
4344
androidTestCompile "com.android.support:support-annotations:24.2.1"
@@ -48,6 +49,6 @@ dependencies {
4849
androidTestCompile "org.mockito:mockito-core:$mockito_ver"
4950
androidTestCompile "com.google.dexmaker:dexmaker:$dexmaker_ver"
5051
androidTestCompile "com.google.dexmaker:dexmaker-mockito:$dexmaker_ver"
51-
androidTestCompile 'com.optimizely.ab:android-sdk:0.2.0'
52-
// androidTestCompile project(':android-sdk')
52+
// androidTestCompile 'com.optimizely.ab:android-sdk:0.2.0'
53+
androidTestCompile project(':android-sdk')
5354
}

0 commit comments

Comments
 (0)