Skip to content

Commit 5df5c3a

Browse files
abarisainabarisain
committed
Batch SDK 1.5
1 parent 810c7c3 commit 5df5c3a

File tree

9 files changed

+82
-100
lines changed

9 files changed

+82
-100
lines changed

‎SDK/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
CHANGELOG
22
=========
33

4+
1.5
5+
----
6+
* Custom user data (attributes, tags and events)
7+
* Added an API to retrieve Batch's unique installation identifier
8+
* Deprecated BatchUserProfile
9+
* Added ability to start Batch in a service
10+
411
1.4
512
-----
613
* Batch Ads has been discontinued

‎SDK/Eclipse/Batch/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package="com.batch.android">
33

44
<uses-sdk
5-
android:targetSdkVersion="22" />
5+
android:targetSdkVersion="23" />
66

77
<application />
88

‎SDK/Eclipse/Batch/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ buildscript {
1111
apply plugin: 'com.android.library'
1212

1313
android {
14-
compileSdkVersion 22
15-
buildToolsVersion "22.0.1"
14+
compileSdkVersion 23
15+
buildToolsVersion "23.0.2"
1616

1717
defaultConfig {
1818
minSdkVersion 9
19-
targetSdkVersion 22
19+
targetSdkVersion 23
2020
}
2121

2222
sourceSets {

‎SDK/Eclipse/Batch/libs/batch.jar

40.3 KB
Binary file not shown.

‎SDK/Eclipse/Batch/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-21
14+
target=android-23
1515
android.library=true

‎SDK/Gradle/Batch.aar

35.1 KB
Binary file not shown.

‎Sample_Project/sample/.idea/misc.xml

Lines changed: 0 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sample_Project/sample/app/app.iml

Lines changed: 63 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -64,80 +64,82 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
6768
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7271
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/22.0.0/jars" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.batch.android/batch-sdk/1.3.2/jars" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.5.0/jars" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.5.0/jars" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/7.5.0/jars" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appinvite/7.5.0/jars" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appstate/7.5.0/jars" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.5.0/jars" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/7.5.0/jars" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-drive/7.5.0/jars" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-fitness/7.5.0/jars" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-games/7.5.0/jars" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/7.5.0/jars" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-identity/7.5.0/jars" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/7.5.0/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/7.5.0/jars" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-nearby/7.5.0/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-panorama/7.5.0/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/7.5.0/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-safetynet/7.5.0/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wallet/7.5.0/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.5.0/jars" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services/7.5.0/jars" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.batch.android/batch-sdk/1.5/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/8.4.0/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/8.4.0/jars" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/8.4.0/jars" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appinvite/8.4.0/jars" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appstate/8.4.0/jars" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth/8.4.0/jars" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/8.4.0/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/8.4.0/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-drive/8.4.0/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-fitness/8.4.0/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-games/8.4.0/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/8.4.0/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-identity/8.4.0/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/8.4.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/8.4.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-measurement/8.4.0/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-nearby/8.4.0/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-panorama/8.4.0/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/8.4.0/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-safetynet/8.4.0/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/8.4.0/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wallet/8.4.0/jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/8.4.0/jars" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services/8.4.0/jars" />
99101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
104102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
106103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
108104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
109106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
110107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
111109
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
112110
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
113111
</content>
114-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
112+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
115113
<orderEntry type="sourceFolder" forTests="false" />
116-
<orderEntry type="library" exported="" name="play-services-wallet-7.5.0" level="project" />
117-
<orderEntry type="library" exported="" name="play-services-cast-7.5.0" level="project" />
118-
<orderEntry type="library" exported="" name="mediarouter-v7-22.0.0" level="project" />
119-
<orderEntry type="library" exported="" name="play-services-drive-7.5.0" level="project" />
120-
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
121-
<orderEntry type="library" exported="" name="play-services-analytics-7.5.0" level="project" />
122-
<orderEntry type="library" exported="" name="play-services-panorama-7.5.0" level="project" />
123-
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
124-
<orderEntry type="library" exported="" name="play-services-appindexing-7.5.0" level="project" />
125-
<orderEntry type="library" exported="" name="play-services-location-7.5.0" level="project" />
126-
<orderEntry type="library" exported="" name="play-services-ads-7.5.0" level="project" />
127-
<orderEntry type="library" exported="" name="play-services-safetynet-7.5.0" level="project" />
128-
<orderEntry type="library" exported="" name="play-services-base-7.5.0" level="project" />
129-
<orderEntry type="library" exported="" name="play-services-7.5.0" level="project" />
130-
<orderEntry type="library" exported="" name="play-services-gcm-7.5.0" level="project" />
131-
<orderEntry type="library" exported="" name="play-services-appinvite-7.5.0" level="project" />
132-
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
133-
<orderEntry type="library" exported="" name="play-services-fitness-7.5.0" level="project" />
134-
<orderEntry type="library" exported="" name="play-services-nearby-7.5.0" level="project" />
135-
<orderEntry type="library" exported="" name="play-services-plus-7.5.0" level="project" />
136-
<orderEntry type="library" exported="" name="play-services-wearable-7.5.0" level="project" />
137-
<orderEntry type="library" exported="" name="play-services-appstate-7.5.0" level="project" />
138-
<orderEntry type="library" exported="" name="play-services-games-7.5.0" level="project" />
139-
<orderEntry type="library" exported="" name="play-services-identity-7.5.0" level="project" />
140-
<orderEntry type="library" exported="" name="play-services-maps-7.5.0" level="project" />
141-
<orderEntry type="library" exported="" name="batch-sdk-1.3.2" level="project" />
114+
<orderEntry type="library" exported="" name="play-services-appindexing-8.4.0" level="project" />
115+
<orderEntry type="library" exported="" name="play-services-location-8.4.0" level="project" />
116+
<orderEntry type="library" exported="" name="play-services-plus-8.4.0" level="project" />
117+
<orderEntry type="library" exported="" name="play-services-auth-8.4.0" level="project" />
118+
<orderEntry type="library" exported="" name="play-services-wearable-8.4.0" level="project" />
119+
<orderEntry type="library" exported="" name="play-services-base-8.4.0" level="project" />
120+
<orderEntry type="library" exported="" name="play-services-measurement-8.4.0" level="project" />
121+
<orderEntry type="library" exported="" name="play-services-identity-8.4.0" level="project" />
122+
<orderEntry type="library" exported="" name="play-services-maps-8.4.0" level="project" />
123+
<orderEntry type="library" exported="" name="play-services-cast-8.4.0" level="project" />
124+
<orderEntry type="library" exported="" name="play-services-vision-8.4.0" level="project" />
125+
<orderEntry type="library" exported="" name="play-services-wallet-8.4.0" level="project" />
126+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
127+
<orderEntry type="library" exported="" name="play-services-8.4.0" level="project" />
128+
<orderEntry type="library" exported="" name="play-services-analytics-8.4.0" level="project" />
129+
<orderEntry type="library" exported="" name="play-services-drive-8.4.0" level="project" />
130+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
131+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
132+
<orderEntry type="library" exported="" name="play-services-ads-8.4.0" level="project" />
133+
<orderEntry type="library" exported="" name="play-services-appinvite-8.4.0" level="project" />
134+
<orderEntry type="library" exported="" name="play-services-safetynet-8.4.0" level="project" />
135+
<orderEntry type="library" exported="" name="play-services-appstate-8.4.0" level="project" />
136+
<orderEntry type="library" exported="" name="play-services-games-8.4.0" level="project" />
137+
<orderEntry type="library" exported="" name="play-services-gcm-8.4.0" level="project" />
138+
<orderEntry type="library" exported="" name="mediarouter-v7-23.0.0" level="project" />
139+
<orderEntry type="library" exported="" name="play-services-nearby-8.4.0" level="project" />
140+
<orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
141+
<orderEntry type="library" exported="" name="play-services-fitness-8.4.0" level="project" />
142+
<orderEntry type="library" exported="" name="play-services-panorama-8.4.0" level="project" />
143+
<orderEntry type="library" exported="" name="batch-sdk-1.5" level="project" />
142144
</component>
143145
</module>

‎Sample_Project/sample/app/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ repositories {
1212
apply plugin: 'com.android.application'
1313

1414
android {
15-
compileSdkVersion 22
16-
buildToolsVersion "22.0.1"
15+
compileSdkVersion 23
16+
buildToolsVersion "23.0.2"
1717

1818
defaultConfig {
1919
applicationId "com.batch.android.sample"
2020
minSdkVersion 10
21-
targetSdkVersion 22
21+
targetSdkVersion 23
2222
versionCode 1
2323
versionName "1.0"
2424
}
@@ -32,8 +32,8 @@ android {
3232

3333
dependencies {
3434
compile fileTree(dir: 'libs', include: ['*.jar'])
35-
compile 'com.android.support:appcompat-v7:22.2.0'
36-
compile 'com.android.support:support-v4:22.2.0'
37-
compile 'com.google.android.gms:play-services:7.5.0'
38-
compile 'com.batch.android:batch-sdk:1.4+'
35+
compile 'com.android.support:appcompat-v7:23.1.1'
36+
compile 'com.android.support:support-v4:23.1.1'
37+
compile 'com.google.android.gms:play-services:8.4.0'
38+
compile 'com.batch.android:batch-sdk:1.5+'
3939
}

0 commit comments

Comments
 (0)