Skip to content

Commit 3bf4d5e

Browse files
author
Andrew Tivodar
committed
Merge pull request #46 from Jaspersoft/1.11
Merge: Release SDK 1.11
2 parents 86b577b + b0c5d71 commit 3bf4d5e

File tree

174 files changed

+2914
-1266
lines changed

Some content is hidden

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

174 files changed

+2914
-1266
lines changed

‎build.gradle‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
/*
2+
* Copyright (C) 2015 TIBCO Jaspersoft Corporation. All rights reserved.
3+
* http://community.jaspersoft.com/project/mobile-sdk-android
4+
*
5+
* Unless you have purchased a commercial license agreement from TIBCO Jaspersoft,
6+
* the following license terms apply:
7+
*
8+
* This program is part of TIBCO Jaspersoft Mobile SDK for Android.
9+
*
10+
* TIBCO Jaspersoft Mobile SDK is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU Lesser General Public License as published by
12+
* the Free Software Foundation, either version 3 of the License, or
13+
* (at your option) any later version.
14+
*
15+
* TIBCO Jaspersoft Mobile SDK is distributed in the hope that it will be useful,
16+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
* GNU Lesser General Public License for more details.
19+
*
20+
* You should have received a copy of the GNU Lesser General Public License
21+
* along with TIBCO Jaspersoft Mobile SDK for Android. If not, see
22+
* <http://www.gnu.org/licenses/lgpl>.
23+
*/
24+
125
buildscript {
226
repositories {
327
jcenter()
@@ -14,8 +38,8 @@ buildscript {
1438
subprojects {
1539
group = 'com.jaspersoft.android.sdk'
1640

17-
ext.clientModuleVersion = '1.10'
18-
ext.clientModuleVersionCode = 9011000
41+
ext.clientModuleVersion = '1.11'
42+
ext.clientModuleVersionCode = 9011100
1943

2044
ext.androidMinSdkVersion = 9
2145
ext.androidBuildToolsVersion = '21.1.2'
@@ -29,7 +53,7 @@ subprojects {
2953
}
3054
}
3155

32-
apply plugin: 'java' // ensure clean is also triggered for root build folder
56+
apply plugin: 'java' // ensure clean is also triggered for root build folder
3357
apply plugin: 'build-dashboard'
3458

3559
buildDashboard {

‎client/build.gradle‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
/*
2+
* Copyright (C) 2015 TIBCO Jaspersoft Corporation. All rights reserved.
3+
* http://community.jaspersoft.com/project/mobile-sdk-android
4+
*
5+
* Unless you have purchased a commercial license agreement from TIBCO Jaspersoft,
6+
* the following license terms apply:
7+
*
8+
* This program is part of TIBCO Jaspersoft Mobile SDK for Android.
9+
*
10+
* TIBCO Jaspersoft Mobile SDK is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU Lesser General Public License as published by
12+
* the Free Software Foundation, either version 3 of the License, or
13+
* (at your option) any later version.
14+
*
15+
* TIBCO Jaspersoft Mobile SDK is distributed in the hope that it will be useful,
16+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
* GNU Lesser General Public License for more details.
19+
*
20+
* You should have received a copy of the GNU Lesser General Public License
21+
* along with TIBCO Jaspersoft Mobile SDK for Android. If not, see
22+
* <http://www.gnu.org/licenses/lgpl>.
23+
*/
24+
125
apply plugin: 'com.android.library'
226
apply plugin: 'com.github.dcendents.android-maven'
327

‎client/src/main/AndroidManifest.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
Copyright (C) 2012-2014 Jaspersoft Corporation. All rights reserved.
4-
http://community.jaspersoft.com/project/mobile-sdk-android
5-
6-
Unless you have purchased a commercial license agreement from Jaspersoft,
7-
the following license terms apply:
8-
9-
This program is part of Jaspersoft Mobile SDK for Android.
10-
11-
Jaspersoft Mobile SDK is free software: you can redistribute it and/or modify
12-
it under the terms of the GNU Lesser General Public License as published by
13-
the Free Software Foundation, either version 3 of the License, or
14-
(at your option) any later version.
15-
16-
Jaspersoft Mobile SDK is distributed in the hope that it will be useful,
17-
but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
GNU Lesser General Public License for more details.
20-
21-
You should have received a copy of the GNU Lesser General Public License
22-
along with Jaspersoft Mobile SDK for Android. If not, see
23-
<http://www.gnu.org/licenses/lgpl>.
24-
-->
3+
~ Copyright (C) 2015 TIBCO Jaspersoft Corporation. All rights reserved.
4+
~ http://community.jaspersoft.com/project/mobile-sdk-android
5+
~
6+
~ Unless you have purchased a commercial license agreement from TIBCO Jaspersoft,
7+
~ the following license terms apply:
8+
~
9+
~ This program is part of TIBCO Jaspersoft Mobile SDK for Android.
10+
~
11+
~ TIBCO Jaspersoft Mobile SDK is free software: you can redistribute it and/or modify
12+
~ it under the terms of the GNU Lesser General Public License as published by
13+
~ the Free Software Foundation, either version 3 of the License, or
14+
~ (at your option) any later version.
15+
~
16+
~ TIBCO Jaspersoft Mobile SDK is distributed in the hope that it will be useful,
17+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
~ GNU Lesser General Public License for more details.
20+
~
21+
~ You should have received a copy of the GNU Lesser General Public License
22+
~ along with TIBCO Jaspersoft Mobile SDK for Android. If not, see
23+
~ <http://www.gnu.org/licenses/lgpl>.
24+
-->
2525

2626
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2727
package="com.jaspersoft.android.sdk.client" >

‎client/src/main/java/com/jaspersoft/android/sdk/client/DataTypeConverterCreator.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
/*
2+
* Copyright (C) 2015 TIBCO Jaspersoft Corporation. All rights reserved.
3+
* http://community.jaspersoft.com/project/mobile-sdk-android
4+
*
5+
* Unless you have purchased a commercial license agreement from TIBCO Jaspersoft,
6+
* the following license terms apply:
7+
*
8+
* This program is part of TIBCO Jaspersoft Mobile SDK for Android.
9+
*
10+
* TIBCO Jaspersoft Mobile SDK is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU Lesser General Public License as published by
12+
* the Free Software Foundation, either version 3 of the License, or
13+
* (at your option) any later version.
14+
*
15+
* TIBCO Jaspersoft Mobile SDK is distributed in the hope that it will be useful,
16+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
* GNU Lesser General Public License for more details.
19+
*
20+
* You should have received a copy of the GNU Lesser General Public License
21+
* along with TIBCO Jaspersoft Mobile SDK for Android. If not, see
22+
* <http://www.gnu.org/licenses/lgpl>.
23+
*/
24+
125
package com.jaspersoft.android.sdk.client;
226

327
import android.support.annotation.NonNull;

‎client/src/main/java/com/jaspersoft/android/sdk/client/GSONDataTypeConverterCreator.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
/*
2-
* Copyright � 2015 TIBCO Software, Inc. All rights reserved.
3-
* http://community.jaspersoft.com/project/jaspermobile-android
2+
* Copyright (C) 2015 TIBCO Jaspersoft Corporation. All rights reserved.
3+
* http://community.jaspersoft.com/project/mobile-sdk-android
44
*
5-
* Unless you have purchased a commercial license agreement from Jaspersoft,
5+
* Unless you have purchased a commercial license agreement from TIBCO Jaspersoft,
66
* the following license terms apply:
77
*
8-
* This program is part of Jaspersoft Mobile for Android.
8+
* This program is part of TIBCO Jaspersoft Mobile SDK for Android.
99
*
10-
* Jaspersoft Mobile is free software: you can redistribute it and/or modify
10+
* TIBCO Jaspersoft Mobile SDK is free software: you can redistribute it and/or modify
1111
* it under the terms of the GNU Lesser General Public License as published by
1212
* the Free Software Foundation, either version 3 of the License, or
1313
* (at your option) any later version.
1414
*
15-
* Jaspersoft Mobile is distributed in the hope that it will be useful,
15+
* TIBCO Jaspersoft Mobile SDK is distributed in the hope that it will be useful,
1616
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1717
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1818
* GNU Lesser General Public License for more details.
1919
*
2020
* You should have received a copy of the GNU Lesser General Public License
21-
* along with Jaspersoft Mobile for Android. If not, see
21+
* along with TIBCO Jaspersoft Mobile SDK for Android. If not, see
2222
* <http://www.gnu.org/licenses/lgpl>.
2323
*/
2424

0 commit comments

Comments
 (0)