Sitelet https://github.com/out0fmemory/java/commit/e6347d3a9d2015a3b1f4bf6caf6d37cada2aa29e
Skip to content

Commit e6347d3

Browse files
author
Devendra
committed
Merge branch 'master' into develop
2 parents b625869 + f439d16 commit e6347d3

62 files changed

Lines changed: 14377 additions & 12012 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
02-14-16 - 3.7.6 - fe6178c
2+
. fix for removal of starting and trailing quotes from strings
3+
. fix for bug in receiving "
4+
. changing string escape method
5+
. fix for race condition where new worker is getting created after shutdown
6+
. remove existing auth key in grants
7+
. Fix internalization bug in message deserialization
8+
19
8-17-15 - 3.7.5 - ecb437e
210
. fix for wildcard audit and grant
311
. channel group presence

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.5
1+
3.7.6

‎android/Pubnub-Android-3.7.5.jar‎

-71.2 KB
Binary file not shown.

‎android/Pubnub-Android-3.7.6.jar‎

82.8 KB
Binary file not shown.

‎android/Pubnub-Android-Debug-3.7.5-develop-6cf9a71.jar‎

-107 KB
Binary file not shown.

‎android/Pubnub-Android-Debug-3.7.5.jar‎

-96.3 KB
Binary file not shown.

‎android/Pubnub-Android-Debug-3.7.6.jar‎

111 KB
Binary file not shown.

‎android/build.xml‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,19 @@
2424
<property name="pubnub_debug_lib_jar" value="Pubnub-Android-Debug-${VERSION}.jar"/>
2525
<property name="java_core_path" value="../java"/>
2626
<property name="src_pubnub_api_path" value="${java_core_path}/srcPubnubApi"/>
27+
<property name="src_pubnub_core_path" value="${java_core_path}/srcPubnubApi/srcCore"/>
28+
<property name="src_pubnub_core_http_path" value="${java_core_path}/srcPubnubApi/srcCoreHttp"/>
29+
<property name="src_pubnub_interfaces_path" value="${java_core_path}/srcPubnubApi/srcInterfaces"/>
2730
<property name="src_java_path" value="${java_core_path}/src1"/>
2831
<property name="src_logging_path" value="./srcLogging"/>
2932
<property name="src_crypto_path" value="./srcCrypto"/>
3033
<property name="src_android_path" value="./src"/>
3134
<property name="android_jar_path" value="jars"/>
3235

3336
<property name="srcPubnubApi.link" value="../java/srcPubnubApi"/>
34-
<property name="sources_pubnub_api" value="${srcPubnubApi.link}/com/pubnub/api"/>
37+
<property name="sources_pubnub_core" value="${srcPubnubApi.link}/srcCore/com/pubnub/api"/>
38+
<property name="sources_pubnub_core_http" value="${srcPubnubApi.link}/srcCoreHttp/com/pubnub/api"/>
39+
<property name="sources_pubnub_interfaces" value="${srcPubnubApi.link}/srcInterfaces/com/pubnub/api"/>
3540
<property name="sources_pubnub_logging" value="srcLogging/com/pubnub/api"/>
3641
<property name="sources_pubnub_java1" value="../java/src1/com/pubnub/api"/>
3742
<property name="sources_pubnub_java" value="src/com/pubnub/api"/>
@@ -226,12 +231,17 @@
226231
<mkdir dir="${build}" />
227232
<mkdir dir="${maven}/src/com/pubnub/api" />
228233
<copy todir="${maven}/src/com/pubnub/api" >
229-
<fileset dir="${sources_pubnub_java}" />
234+
<fileset dir="${sources_pubnub_core}" />
235+
<fileset dir="${sources_pubnub_core_http}" />
236+
<fileset dir="${sources_pubnub_interfaces}" />
230237
<fileset dir="${sources_pubnub_java1}" />
238+
<fileset dir="${sources_pubnub_java}" />
231239
<fileset dir="${sources_pubnub_logging}" />
232-
<fileset dir="${sources_pubnub_api}" />
233240
<fileset dir="${sources_pubnub_crypto}" />
234241
</copy>
242+
<replace dir="${maven}/src" token='static String VERSION = ""' value='static String VERSION = "${VERSION}"'>
243+
<include name="**/*.java"/>
244+
</replace>
235245
<mkdir dir="${dist}/lib" />
236246
<antcall target="stage"/>
237247
<antcall target="maven_clean"/>
@@ -241,12 +251,17 @@
241251
<mkdir dir="${build}" />
242252
<mkdir dir="${maven}/src/com/pubnub/api" />
243253
<copy todir="${maven}/src/com/pubnub/api" >
244-
<fileset dir="${sources_pubnub_java}" />
254+
<fileset dir="${sources_pubnub_core}" />
255+
<fileset dir="${sources_pubnub_core_http}" />
256+
<fileset dir="${sources_pubnub_interfaces}" />
245257
<fileset dir="${sources_pubnub_crypto}" />
246258
<fileset dir="${sources_pubnub_java1}" />
259+
<fileset dir="${sources_pubnub_java}" />
247260
<fileset dir="${sources_pubnub_logging}" />
248-
<fileset dir="${sources_pubnub_api}" />
249261
</copy>
262+
<replace dir="${maven}/src" token='static String VERSION = ""' value='static String VERSION = "${VERSION}"'>
263+
<include name="**/*.java"/>
264+
</replace>
250265
<replace dir="${maven}/src" token="boolean LOGGING = false" value="boolean LOGGING = true">
251266
<include name="**/*.java"/>
252267
</replace>

‎android/examples/PubnubExample/libs/Pubnub-Android-3.7.5.jar‎

-71.2 KB
Binary file not shown.

‎android/examples/PubnubExample/libs/Pubnub-Android-3.7.6.jar‎

82.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)