Skip to content

Commit b9e4e91

Browse files
Merge pull request #40 from contentstack/CS-40978/bug-branch-region-support
LICENSE added
2 parents a77f3b3 + 8004370 commit b9e4e91

File tree

4 files changed

+28
-29
lines changed

4 files changed

+28
-29
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ jobs:
5151

5252
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5353
# If this step fails, then you should remove it and run the build manually (see below)
54-
- name: Autobuild
55-
uses: github/codeql-action/autobuild@v2
54+
# - name: Autobuild
55+
# uses: github/codeql-action/autobuild@v2
5656

5757
# ℹ️ Command-line programs to run using the OS shell.
5858
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -64,5 +64,5 @@ jobs:
6464
# echo "Run, Build Application using script"
6565
# ./location_of_script_within_repo/buildscript.sh
6666

67-
- name: Perform CodeQL Analysis
68-
uses: github/codeql-action/analyze@v2
67+
# - name: Perform CodeQL Analysis
68+
# uses: github/codeql-action/analyze@v2

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2012 - 2023 Contentstack
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

contentstack/build.gradle

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,8 @@ android {
1616
signingConfig signingConfigs.debug
1717
}
1818
buildTypes {
19-
def localProperties = new Properties()
20-
localProperties.load(new FileInputStream(rootProject.file("local.properties")))
21-
22-
debug {
23-
testCoverageEnabled true
24-
buildConfigField "String", "host", localProperties['host']
25-
buildConfigField "String", "APIKey", localProperties['APIKey']
26-
buildConfigField "String", "deliveryToken", localProperties['deliveryToken']
27-
buildConfigField "String", "environment", localProperties['env']
28-
buildConfigField "String", "contentTypeUID", localProperties['contentType']
29-
buildConfigField "String", "assetUID", localProperties['assetUid']
30-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
31-
}
32-
release {
33-
minifyEnabled false
34-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
35-
buildConfigField "String", "host", localProperties['host']
36-
buildConfigField "String", "APIKey", localProperties['APIKey']
37-
buildConfigField "String", "deliveryToken", localProperties['deliveryToken']
38-
buildConfigField "String", "environment", localProperties['env']
39-
buildConfigField "String", "contentTypeUID", localProperties['contentType']
40-
buildConfigField "String", "assetUID", localProperties['assetUid']
41-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
42-
}
19+
//def localProperties = new Properties()
20+
//localProperties.load(new FileInputStream(rootProject.file("local.properties")))
4321
}
4422
compileOptions {
4523
sourceCompatibility JavaVersion.VERSION_11

scripts/publish-module.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'signing'
55
ext {
66
PUBLISH_GROUP_ID = 'com.contentstack.sdk'
77
PUBLISH_ARTIFACT_ID = 'android'
8-
PUBLISH_VERSION = '3.12.0-SNAPSHOT'
8+
PUBLISH_VERSION = '3.12.1'
99
POM_NAME = 'contentstack-android'
1010
WEBSITE = 'http://www.contentstack.com'
1111
PUBLISH_DESCRIPTION = 'The Content Delivery SDK is used to retrieve content from your Contentstack account and deliver it to your web or mobile properties.'

0 commit comments

Comments
 (0)