Skip to content

Commit 0c2d400

Browse files
committed
Update license
1 parent 4e5af61 commit 0c2d400

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

CISCO_API_LICENSE.pdf

68.1 KB
Binary file not shown.

LICENSE

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
Except the "com.cisco.spark.android:common-lib" and "com.webex:wme4android-release"
2-
licensed under Cisco EULA
3-
(https://www.cisco.com/c/en/us/products/end-user-license-agreement.html),
4-
everything else is licensed under MIT License below.
1+
- Except the "Wme.framework" licensed under Cisco API license (see CISCO_API_LICENSE.pdf),
2+
- And except the H264 codec license under the following license https://developer.ciscospark.com/docs/sdk-widgets/ios/h264-license-information.html
3+
Everything else is licensed under MIT License below.
54

65
MIT License
76

8-
Copyright (c) 2016-2017 Cisco Systems, Inc.
7+
Copyright (c) 2016-2018 Cisco Systems, Inc.
98

109
Permission is hereby granted, free of charge, to any person obtaining a copy
1110
of this software and associated documentation files (the "Software"), to deal

sdk/build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ext {
99

1010
moduleGroupId = 'com.ciscospark'
1111
moduleArtifactId = 'androidsdk'
12-
moduleVersion = '1.3.0-SNAPSHOT'
12+
moduleVersion = '1.3.0'
1313

1414
moduleDescription = 'Cisco Spark SDK for Android'
1515

@@ -133,6 +133,7 @@ android {
133133
from fromDir
134134
into outputAarUnzipedDir
135135
include 'LICENSE'
136+
include 'CISCO API LICENSE FINAL.pdf'
136137
}
137138

138139
task reZipAar(type: Zip, dependsOn: 'addLicenseFileInUnzipedAar') {
@@ -227,7 +228,7 @@ publishing {
227228
dependencies {
228229
compile fileTree(dir: 'libs', include: ['*.jar'])
229230
provided 'com.squareup.dagger:dagger-compiler:1.2.5'
230-
compile('com.cisco.spark.android:common-lib:2.0.4055130-SNAPSHOT@aar', {
231+
compile('com.cisco.spark.android:common-lib:2.0.4055130@aar', {
231232
transitive = true
232233
})
233234
testCompile 'com.squareup.okhttp3:okhttp:3.9.0'
@@ -254,6 +255,7 @@ def revision() {
254255
task sourcesJar(type: Jar) {
255256
classifier = 'sources'
256257
from "../LICENSE"
258+
from "../CISCO API LICENSE FINAL.pdf"
257259
from android.sourceSets.main.java.srcDirs
258260
}
259261

0 commit comments

Comments
 (0)