Skip to content

Commit 298429e

Browse files
author
Julia Valchuk
committed
Merge remote-tracking branch 'origin/master' into T-9293
Conflicts: samples/DataService/tododemo/libs/backendless.jar samples/FileService/filedemo/libs/backendless.jar samples/GeoService/geodemo/libs/backendless.jar samples/MessagingService/pubsubdemo/libs/backendless.jar samples/MessagingService/pushdemo/libs/backendless.jar samples/UserService/rolesdemo/libs/backendless.jar samples/UserService/userservicedemo/libs/backendless.jar
2 parents d0ff9f3 + aab41d4 commit 298429e

File tree

40 files changed

+1081
-114
lines changed

40 files changed

+1081
-114
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
android.iml
2+
androidSDK.iml
3+
androidSDK.ipr
4+
androidSDK.iws
5+
out/

‎libs/mediaLib.jar‎

-2.04 KB
Binary file not shown.

‎out/backendless.jar‎

6.77 KB
Binary file not shown.

‎pom.xml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
!!! NOT FOR USE !!!
4+
-->
5+
<project xmlns="http://maven.apache.org/POM/4.0.0"
6+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
8+
<modelVersion>4.0.0</modelVersion>
9+
10+
<groupId>com.backendless</groupId>
11+
<artifactId>android</artifactId>
12+
<version>1.17</version>
13+
14+
<name>Android SDK for Backendless services</name>
15+
<description>Android SDK used by developers to provide Backendless API in apps.</description>
16+
17+
<url>https://github.com/Backendless/Android-SDK</url>
18+
19+
<licenses>
20+
<license>
21+
<name>The Apache License, Version 2.0</name>
22+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
23+
</license>
24+
</licenses>
25+
26+
<developers>
27+
<developer>
28+
<name>Mark Piller</name>
29+
<email>[email protected]</email>
30+
<organization>Backendless</organization>
31+
<organizationUrl>http://www.backendless.com</organizationUrl>
32+
</developer>
33+
</developers>
34+
35+
<scm>
36+
<connection>scm:git:[email protected]:Backendless/Android-SDK.git</connection>
37+
<developerConnection>scm:git:[email protected]:Backendless/Android-SDK.git</developerConnection>
38+
<url>[email protected]:Backendless/Android-SDK.git</url>
39+
</scm>
40+
41+
<properties>
42+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
43+
<maven.compiler.target>1.6</maven.compiler.target>
44+
<maven.compiler.source>1.6</maven.compiler.source>
45+
</properties>
46+
47+
<dependencies>
48+
49+
<dependency>
50+
<groupId>com.google.android</groupId>
51+
<artifactId>android</artifactId>
52+
<version>2.3.3</version>
53+
<systemPath>${pom.basedir}/libs/android.jar</systemPath>
54+
<scope>system</scope>
55+
</dependency>
56+
57+
58+
<dependency>
59+
<groupId>com.backendless</groupId>
60+
<artifactId>commons</artifactId>
61+
<version>2.0.2</version>
62+
<systemPath>${pom.basedir}/libs/commons-2.0.2.jar</systemPath>
63+
<scope>system</scope>
64+
</dependency>
65+
66+
<dependency>
67+
<groupId>com.backendless</groupId>
68+
<artifactId>medialib</artifactId>
69+
<version>1.0</version>
70+
<systemPath>${pom.basedir}/libs/mediaLib.jar</systemPath>
71+
<scope>system</scope>
72+
</dependency>
73+
74+
<dependency>
75+
<groupId>com.facebook.android</groupId>
76+
<artifactId>facebook-android-sdk</artifactId>
77+
<version>3.21.1</version>
78+
<systemPath>${pom.basedir}/libs/FacebookSDK.jar</systemPath>
79+
<scope>system</scope>
80+
</dependency>
81+
82+
<dependency>
83+
<groupId>weborb</groupId>
84+
<artifactId>client</artifactId>
85+
<version>5.1.0.193</version>
86+
<systemPath>${pom.basedir}/libs/weborbclient.jar</systemPath>
87+
<scope>system</scope>
88+
</dependency>
89+
90+
</dependencies>
91+
92+
<build>
93+
<sourceDirectory>src</sourceDirectory>
94+
<plugins>
95+
<plugin>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-compiler-plugin</artifactId>
98+
<version>3.1</version>
99+
<configuration>
100+
<encoding>${project.build.sourceEncoding}</encoding>
101+
<source>${maven.compiler.source}</source>
102+
<target>${maven.compiler.target}</target>
103+
</configuration>
104+
</plugin>
105+
</plugins>
106+
</build>
107+
</project>

‎postprocess.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<copy file="out/backendless.jar" todir="samples/MessagingService/pushdemo/libs" overwrite="true"/>
2626
<copy file="out/backendless.jar" todir="samples/UserService/userservicedemo/libs" overwrite="true"/>
2727
<copy file="out/backendless.jar" todir="samples/UserService/rolesdemo/libs" overwrite="true"/>
28+
<copy file="out/backendless.jar" todir="samples/FenceDemo/libs" overwrite="true"/>
2829
<copy file="out/backendless.jar" todir="../../tests/android/junit/libs" overwrite="true"/>
2930
</target>
3031
</project>

‎samples/DataService/tododemo/libs/backendless.jar‎

-2.38 KB
Binary file not shown.

‎samples/FenceDemo/AndroidManifest.xml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ *********************************************************************************************************************
4+
~ <p/>
5+
~ BACKENDLESS.COM CONFIDENTIAL
6+
~ <p/>
7+
~ ********************************************************************************************************************
8+
~ <p/>
9+
~ Copyright 2012 BACKENDLESS.COM. All Rights Reserved.
10+
~ <p/>
11+
~ NOTICE: All information contained herein is, and remains the property of Backendless.com and its suppliers,
12+
~ if any. The intellectual and technical concepts contained herein are proprietary to Backendless.com and its
13+
~ suppliers and may be covered by U.S. and Foreign Patents, patents in process, and are protected by trade secret
14+
~ or copyright law. Dissemination of this information or reproduction of this material is strictly forbidden
15+
~ unless prior written permission is obtained from Backendless.com.
16+
~ <p/>
17+
~ ********************************************************************************************************************
18+
-->
19+
20+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
21+
package="com.backendless.fencedemo"
22+
android:versionCode="1"
23+
android:versionName="1.0">
24+
<uses-sdk android:minSdkVersion="16"/>
25+
26+
<uses-permission android:name="android.permission.INTERNET" />
27+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
28+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
29+
30+
<application android:label="@string/app_name">
31+
<activity android:name=".FenceDemo"
32+
android:label="@string/app_name">
33+
<intent-filter>
34+
<action android:name="android.intent.action.MAIN"/>
35+
<category android:name="android.intent.category.LAUNCHER"/>
36+
</intent-filter>
37+
</activity>
38+
<service android:name="com.backendless.AndroidService"/>
39+
40+
<service android:name="com.backendless.geo.LocationTracker" android:exported="false"/>
41+
<receiver android:name="com.backendless.AutoStart" android:process=":remote">
42+
<intent-filter>
43+
<action android:name="android.intent.action.BOOT_COMPLETED"/>
44+
</intent-filter>
45+
</receiver>
46+
47+
</application>
48+
</manifest>

‎samples/FenceDemo/FenceDemo.iml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android" name="Android">
5+
<configuration />
6+
</facet>
7+
</component>
8+
<component name="NewModuleRootManager" inherit-compiler-output="true">
9+
<exclude-output />
10+
<content url="file://$MODULE_DIR$">
11+
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
12+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
13+
</content>
14+
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
15+
<orderEntry type="sourceFolder" forTests="false" />
16+
<orderEntry type="library" name="backendless1" level="project" />
17+
</component>
18+
</module>

‎samples/FenceDemo/gen/com/backendless/fencedemo/BuildConfig.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*___Generated_by_IDEA___*/
2+
3+
package com.backendless.fencedemo;
4+
5+
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
6+
public final class BuildConfig {
7+
public final static boolean DEBUG = Boolean.parseBoolean(null);
8+
}

‎samples/FenceDemo/gen/com/backendless/fencedemo/Manifest.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* ********************************************************************************************************************
3+
* <p/>
4+
* BACKENDLESS.COM CONFIDENTIAL
5+
* <p/>
6+
* ********************************************************************************************************************
7+
* <p/>
8+
* Copyright 2012 BACKENDLESS.COM. All Rights Reserved.
9+
* <p/>
10+
* NOTICE: All information contained herein is, and remains the property of Backendless.com and its suppliers,
11+
* if any. The intellectual and technical concepts contained herein are proprietary to Backendless.com and its
12+
* suppliers and may be covered by U.S. and Foreign Patents, patents in process, and are protected by trade secret
13+
* or copyright law. Dissemination of this information or reproduction of this material is strictly forbidden
14+
* unless prior written permission is obtained from Backendless.com.
15+
* <p/>
16+
* ********************************************************************************************************************
17+
*/
18+
19+
/*___Generated_by_IDEA___*/
20+
21+
package com.backendless.fencedemo;
22+
23+
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
24+
public final class Manifest {
25+
}

0 commit comments

Comments
 (0)