-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34 from contentstack/next
feat: [CS-37836] - Added support for include metadata in asset, entry and query class - Added support of Region for Azure-EU - General code and API document improvements - Breaking changes : PublishType Enums are updated to all CAPS - Dependency version released in release build type - EntryModel publish_details parsing issue fixed #30
- Loading branch information
Showing
52 changed files
with
1,194 additions
and
2,607 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,21 @@ | ||
| buildscript { | ||
|
|
||
| ext.jacocoVersion = '0.8.8' | ||
|
|
||
| ext.jacoco_version = '0.8.8' | ||
| repositories { | ||
| maven { url "https://plugins.gradle.org/m2/" } | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:7.0.4' //4.1.3 | ||
| classpath "com.android.tools.build:gradle:7.2.2" //7.0.4 | ||
| classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' | ||
| // NOTE: Do not place your application dependencies here | ||
| classpath "org.jacoco:org.jacoco.core:$jacocoVersion" | ||
| classpath "org.jacoco:org.jacoco.core:$jacoco_version" | ||
| } | ||
| } | ||
|
|
||
| apply plugin: 'io.github.gradle-nexus.publish-plugin' | ||
| apply from: "${rootDir}/scripts/publish-root.gradle" | ||
|
|
||
| task clean(type: Delete) { | ||
| tasks.register('clean', Delete) { | ||
| delete rootProject.buildDir | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,22 @@ | ||
| apply plugin: 'com.android.library' | ||
| apply plugin: 'jacoco' | ||
|
|
||
| ext { | ||
| PUBLISH_GROUP_ID = 'com.contentstack.sdk' | ||
| PUBLISH_ARTIFACT_ID = 'android' | ||
| PUBLISH_VERSION = '3.11.0' | ||
| PUBLISH_DESCRIPTION = 'The Content Delivery SDK is used to retrieve content from your Contentstack account and deliver it to your web or mobile properties.' | ||
| PUBLISH_URL = 'https://github.com/contentstack/contentstack-android' | ||
| PUBLISH_LICENSE_NAME = 'MIT License' | ||
| PUBLISH_LICENSE_URL = 'https://github.com/contentstack/contentstack-android/blob/master/LICENSE' | ||
| PUBLISH_DEVELOPER_ID = 'ishaileshmishra' | ||
| PUBLISH_DEVELOPER_NAME = 'Shailesh Mishra' | ||
| PUBLISH_DEVELOPER_EMAIL = '[email protected]' | ||
| PUBLISH_SCM_CONNECTION = 'scm:[email protected]:contentstack/contentstack-android' | ||
| PUBLISH_SCM_DEVELOPER_CONNECTION = 'scm:[email protected]:contentstack/contentstack-android' | ||
| PUBLISH_SCM_URL = 'https://github.com/contentstack/contentstack-android/tree/master' | ||
| } | ||
|
|
||
| apply from: "${rootProject.projectDir}/scripts/publish-module.gradle" | ||
|
|
||
| def localProperties = new Properties() | ||
| localProperties.load(new FileInputStream(rootProject.file("local.properties"))) | ||
|
|
||
| android { | ||
| compileSdkVersion 33 | ||
| compileSdk 33 | ||
| buildToolsVersion '30.0.2' | ||
|
|
||
| defaultConfig { | ||
| minSdkVersion 19 | ||
| minSdk 19 | ||
| targetSdk 33 | ||
| versionCode 1 | ||
| versionName "1.0.0" | ||
| versionName "1.0" | ||
| multiDexEnabled true | ||
| vectorDrawables.useSupportLibrary = true | ||
| testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
| buildTypes { | ||
| debug { | ||
| debuggable true | ||
| testCoverageEnabled true | ||
| buildConfigField "String", "host", localProperties['host'] | ||
| buildConfigField "String", "APIKey", localProperties['APIKey'] | ||
| buildConfigField "String", "deliveryToken", localProperties['deliveryToken'] | ||
| buildConfigField "String", "environment", localProperties['env'] | ||
| buildConfigField "String", "contentTypeUID", localProperties['contentType'] | ||
| buildConfigField "String", "assetUID", localProperties['assetUid'] | ||
| } | ||
|
|
||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| buildConfigField "String", "host", localProperties['host'] | ||
| buildConfigField "String", "APIKey", localProperties['APIKey'] | ||
| buildConfigField "String", "deliveryToken", localProperties['deliveryToken'] | ||
| buildConfigField "String", "environment", localProperties['env'] | ||
| buildConfigField "String", "contentTypeUID", localProperties['contentType'] | ||
| buildConfigField "String", "assetUID", localProperties['assetUid'] | ||
| proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' | ||
| } | ||
| def localProperties = new Properties() | ||
| localProperties.load(new FileInputStream(rootProject.file("local.properties"))) | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_8 | ||
|
|
@@ -74,12 +35,14 @@ android { | |
|
|
||
| dependencies { | ||
| implementation fileTree(dir: 'libs', include: ['*.jar']) | ||
| //testImplementation 'junit:junit:5.9.2' | ||
| // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api | ||
| testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2' | ||
| implementation 'androidx.appcompat:appcompat:1.6.1' | ||
| implementation 'com.android.volley:volley:1.2.1' | ||
| androidTestImplementation 'androidx.test:core:1.5.0' | ||
| androidTestImplementation "androidx.test:runner:1.5.2" | ||
| androidTestImplementation "androidx.test:rules:1.5.0" | ||
| implementation 'androidx.test:core:1.5.0' | ||
| testImplementation 'junit:junit:4.13.2' | ||
| androidTestImplementation 'androidx.test.ext:junit:1.1.5' | ||
| androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' | ||
| } | ||
| java { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| } | ||
Oops, something went wrong.