Merge pull request #36 from adobe/dev

Merge Dev -> Staging for 1.0.0 release, includes build fixes
adobe · Mar 31, 2021 · 295e1f3 · 295e1f3
2 parents 29588fa + d2a3c14
commit 295e1f3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.7
+          java-version: 1.8
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/maven-snapshot.yml b/.github/workflows/maven-snapshot.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.7
+          java-version: 1.8
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:

diff --git a/Makefile b/Makefile
@@ -21,6 +21,7 @@ clean:
 ci-build: create-ci
 	(mkdir -p ci/assemble)
 
+	(./code/gradlew -p code/$(EXTENSION-LIBRARY-FOLDER-NAME) lint)
 	(./code/gradlew -p code/$(EXTENSION-LIBRARY-FOLDER-NAME) assemblePhone)
 	(mv $(AAR_FILE_DIR)/$(EXTENSION-LIBRARY-FOLDER-NAME)-phone-release.aar  $(AAR_FILE_DIR)/$(MODULE_NAME)-release-$(LIB_VERSION).aar)
 	(cp -r ./code/$(EXTENSION-LIBRARY-FOLDER-NAME)/build $(BUILD-ASSEMBLE-LOCATION))
@@ -51,7 +52,7 @@ ci-generate-library-release:
 	(./code/gradlew -p code/${EXTENSION-LIBRARY-FOLDER-NAME}  assemblePhoneRelease)
 
 build-release:
-	(./code/gradlew -p code/${EXTENSION-LIBRARY-FOLDER-NAME} clean assemblePhoneRelease)
+	(./code/gradlew -p code/${EXTENSION-LIBRARY-FOLDER-NAME} clean lint assemblePhoneRelease)
 
 ci-publish-staging: clean build-release
 	(./code/gradlew -p code/${EXTENSION-LIBRARY-FOLDER-NAME} publishReleasePublicationToSonatypeRepository --stacktrace)

diff --git a/...c/androidTest/java/com/adobe/marketing/mobile/edge/identity/IdentityECIDHandlingTest.java b/...c/androidTest/java/com/adobe/marketing/mobile/edge/identity/IdentityECIDHandlingTest.java
@@ -116,16 +116,14 @@ public void testECID_onResetClearsOldECID() throws Exception {
 	@Test
 	public void testECID_AreDifferentAfterPrivacyChange() throws Exception {
 		/// Test Edge Identity and IdentityDirect have same ECID on bootup, and after privacy change ECIDs are different
-		registerIdentityDirectExtension();
-
-		// register EdgeIdentity extension
-		Identity.registerExtension();
+		setIdentityDirectPersistedECID("legacyECID");
+		registerBothIdentityExtensions();
 		TestHelper.waitForThreads(2000);
 
 		// verify ECID for both extensions are same
 		String directECID = getIdentityDirectECIDSync();
 		String edgeECID = getExperienceCloudIdSync();
-		assertNotNull(edgeECID);
+		assertEquals("legacyECID", edgeECID);
 		assertEquals(directECID, edgeECID);
 
 		//  Toggle privacy
@@ -142,16 +140,14 @@ public void testECID_AreDifferentAfterResetIdentitiesAndPrivacyChange() throws E
 		/// Test Edge Identity and IdentityDirect have same ECID on bootup, and after resetIdentities and privacy change ECIDs are different
 
 		// 1) Register Identity then Edge Identity and verify both have same ECID
-		registerIdentityDirectExtension();
-
-		// register EdgeIdentity extension
-		Identity.registerExtension();
+		setIdentityDirectPersistedECID("legacyECID");
+		registerBothIdentityExtensions();
 		TestHelper.waitForThreads(2000);
 
 		// verify ECID for both extensions are same
 		String directECID = getIdentityDirectECIDSync();
 		String edgeECID = getExperienceCloudIdSync();
-		assertNotNull(edgeECID);
+		assertEquals("legacyECID", edgeECID);
 		assertEquals(directECID, edgeECID);
 
 		// 2) Reset identities and toggle privacy and verify legacy ECID added to IdentityMap