Merge pull request #52 from contentstack/feat/DX-67

gcp na support implementation
contentstack · May 13, 2024 · 0b8ee7d · 0b8ee7d
2 parents 8ddc080 + a7dddc9
commit 0b8ee7d
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,6 @@ lib/
 src/androidTest/java/com/builtio/contentstack/ApplicationTest.java
 src/main/res/
 contentstack/src/androidTest/java/com/contentstack/sdk/SyncTestCase.java
+
+# key file
+key.keystore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # CHANGELOG
 
+## Version 3.14.0
+
+### Date: 13-May-2024
+
+- GCP support implementation
+
+---
+
+## Version 3.13.0
+
+### Date: 02-Feb-2024
+
+- Fixed dependency installing issue
+- Fixed Download Issue
+- Error Status Code added
+- Support of early access headers
+
+---
 
 ## Version 3.12.4
 

diff --git a/contentstack/build.gradle b/contentstack/build.gradle
@@ -10,7 +10,7 @@ android.buildFeatures.buildConfig true
 mavenPublishing {
     publishToMavenCentral(SonatypeHost.DEFAULT)
     signAllPublications()
-    coordinates("com.contentstack.sdk", "android", "3.13.0")
+    coordinates("com.contentstack.sdk", "android", "3.14.0")
 
     pom {
         name = "contentstack-android"
@@ -71,20 +71,20 @@ android {
 
     testOptions {
         unitTests.all {
-            jacoco {
-                includeNoLocationClasses = true
-            }
+            // jacoco {
+            //     includeNoLocationClasses = true
+            // }
         }
     }
     signingConfigs {
         debug {
-            storeFile file("/Users/shaileshmishra/keystore/key.keystore")
+            storeFile file("../key.keystore")
             storePassword 'android'
             keyAlias 'key0'
             keyPassword 'android'
         }
         release {
-            storeFile file("/Users/shaileshmishra/keystore/key.keystore")
+            storeFile file("../key.keystore")
             storePassword 'android'
             keyAlias 'key0'
             keyPassword 'android'
@@ -98,7 +98,7 @@ android {
         versionCode 1
         versionName "1.0"
         useLibrary 'org.apache.http.legacy'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         signingConfig signingConfigs.release
     }
 
@@ -143,7 +143,7 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:core:1.5.0'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 }

diff --git a/contentstack/src/androidTest/java/com/contentstack/sdk/AssetTestCase.java b/contentstack/src/androidTest/java/com/contentstack/sdk/AssetTestCase.java
@@ -178,4 +178,17 @@ public void test_AZURE_NA() throws Exception {
         stack = Contentstack.stack(appContext, DEFAULT_API_KEY, DEFAULT_DELIVERY_TOKEN, DEFAULT_ENV, config);
     }
 
+    @Test
+    public void test_GCP_NA() throws Exception {
+        Config config = new Config();
+        String DEFAULT_API_KEY = BuildConfig.APIKey;
+        String DEFAULT_DELIVERY_TOKEN = BuildConfig.deliveryToken;
+        String DEFAULT_ENV = BuildConfig.environment;
+        String DEFAULT_HOST = BuildConfig.host;
+        config.setHost(DEFAULT_HOST);
+        config.setRegion(Config.ContentstackRegion.GCP_NA);
+        Context appContext = InstrumentationRegistry.getTargetContext();
+        stack = Contentstack.stack(appContext, DEFAULT_API_KEY, DEFAULT_DELIVERY_TOKEN, DEFAULT_ENV, config);
+    }
+
 }
diff --git a/contentstack/src/main/java/com/contentstack/sdk/Config.java b/contentstack/src/main/java/com/contentstack/sdk/Config.java
@@ -52,6 +52,7 @@ public void setBranch(String branch) {
      *                                                         config.setRegion(ContentstackRegion.EU);
      *                                                         config.setRegion(ContentstackRegion.AZURE_EU);
      *                                                         config.setRegion(ContentstackRegion.AZURE_NA);
+     *                                                         config.setRegion(ContentstackRegion.GCP_NA);
      *                                                         }
      *                                                         </pre>
      */
@@ -77,7 +78,7 @@ public Config earlyAccess(String[] earlyAccess) {
         return this;
     }
 
-    public enum ContentstackRegion {US, EU, AZURE_NA, AZURE_EU}
+    public enum ContentstackRegion {US, EU, AZURE_NA, AZURE_EU, GCP_NA}
 
     /**
      * Config constructor

diff --git a/contentstack/src/main/java/com/contentstack/sdk/Stack.java b/contentstack/src/main/java/com/contentstack/sdk/Stack.java
@@ -80,6 +80,8 @@ protected void setConfig(Config config) {
                     URL = "azure-na-cdn.contentstack.com";
                 } else if (region.equalsIgnoreCase("azure_eu")) {
                     URL = "azure-eu-cdn.contentstack.com";
+                } else if (region.equalsIgnoreCase("gcp_na")) {
+                    URL = "gcp-na-cdn.contentstack.com";
                 } else {
                     URL = region + "-" + URL;
                 }