diff --git a/.gitignore b/.gitignore index ed8ed4d1..a8439c95 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,5 @@ dist .tern-port build/ +## User settings +xcuserdata/ \ No newline at end of file diff --git a/apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainActivity.java b/apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainActivity.java index e119832a..081f1fa9 100644 --- a/apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainActivity.java +++ b/apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainActivity.java @@ -1,3 +1,14 @@ +/* +Copyright 2021 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ package com.aepsampleapp; import com.facebook.react.ReactActivity; diff --git a/apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainApplication.java b/apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainApplication.java index 06480b42..c8e1d763 100644 --- a/apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainApplication.java +++ b/apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainApplication.java @@ -1,3 +1,14 @@ +/* +Copyright 2021 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ package com.aepsampleapp; import android.app.Application; @@ -61,6 +72,7 @@ public void onCreate() { Identity.registerExtension(); Lifecycle.registerExtension(); Signal.registerExtension(); + MobileCore.configureWithAppID("yourAppID"); MobileCore.start(new AdobeCallback() { @Override public void call(Object o) { diff --git a/apps/AEPSampleApp/android/build.gradle b/apps/AEPSampleApp/android/build.gradle index 93232f5f..73d45048 100644 --- a/apps/AEPSampleApp/android/build.gradle +++ b/apps/AEPSampleApp/android/build.gradle @@ -34,5 +34,6 @@ allprojects { google() jcenter() maven { url 'https://www.jitpack.io' } + mavenCentral() } } diff --git a/apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.h b/apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.h index ba636d12..b1c96ef8 100644 --- a/apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.h +++ b/apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.h @@ -1,3 +1,15 @@ +/* +Copyright 2021 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + #import #import @import AEPCore; diff --git a/apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.m b/apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.m index 2d73c678..c2b19a3d 100644 --- a/apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.m +++ b/apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.m @@ -1,3 +1,15 @@ +/* +Copyright 2021 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + #import "AppDelegate.h" #import @@ -48,7 +60,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( rootViewController.view = rootView; self.window.rootViewController = rootViewController; [self.window makeKeyAndVisible]; - [AEPMobileCore setLogLevel: AEPLogLevelTrace]; + [AEPMobileCore setLogLevel: AEPLogLevelDebug]; + [AEPMobileCore configureWithAppId:@"yourAppID"]; [AEPMobileCore registerExtensions: @[AEPMobileIdentity.class, AEPMobileLifecycle.class, AEPMobileSignal.class, AEPMobileUserProfile.class] completion:^{ [AEPMobileCore lifecycleStart:@{@"contextDataKey": @"contextDataVal"}]; } diff --git a/apps/AEPSampleApp/ios/AEPSampleApp/Empty.swift b/apps/AEPSampleApp/ios/AEPSampleApp/Empty.swift index c8080357..fecc4ab4 100644 --- a/apps/AEPSampleApp/ios/AEPSampleApp/Empty.swift +++ b/apps/AEPSampleApp/ios/AEPSampleApp/Empty.swift @@ -1,8 +1 @@ -// -// Empty.swift -// AEPSampleApp -// -// Created by Yansong Yang on 6/29/21. -// - import Foundation diff --git a/apps/AEPSampleApp/ios/AEPSampleApp/main.m b/apps/AEPSampleApp/ios/AEPSampleApp/main.m index b1df44b9..8b311cd9 100644 --- a/apps/AEPSampleApp/ios/AEPSampleApp/main.m +++ b/apps/AEPSampleApp/ios/AEPSampleApp/main.m @@ -1,3 +1,15 @@ +/* +Copyright 2021 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + #import #import "AppDelegate.h" diff --git a/apps/AEPSampleApp/ios/AEPSampleAppTests/AEPSampleAppTests.m b/apps/AEPSampleApp/ios/AEPSampleAppTests/AEPSampleAppTests.m index 8459c446..cb1cc863 100644 --- a/apps/AEPSampleApp/ios/AEPSampleAppTests/AEPSampleAppTests.m +++ b/apps/AEPSampleApp/ios/AEPSampleAppTests/AEPSampleAppTests.m @@ -1,3 +1,15 @@ +/* +Copyright 2021 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + #import #import diff --git a/packages/userprofile/ios/RCTAEPUserProfile.xcodeproj/xcuserdata/yanyang.xcuserdatad/xcschemes/xcschememanagement.plist b/packages/userprofile/ios/RCTAEPUserProfile.xcodeproj/xcuserdata/yanyang.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index e117017b..00000000 --- a/packages/userprofile/ios/RCTAEPUserProfile.xcodeproj/xcuserdata/yanyang.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,19 +0,0 @@ - - - - - SchemeUserState - - RCTACPUserProfile.xcscheme_^#shared#^_ - - orderHint - 0 - - RCTAEPUserProfile.xcscheme_^#shared#^_ - - orderHint - 0 - - - - diff --git a/packages/userprofile/package.json b/packages/userprofile/package.json index 235aa85d..6372e9fc 100644 --- a/packages/userprofile/package.json +++ b/packages/userprofile/package.json @@ -28,7 +28,7 @@ "name": "Adobe Experience Platform SDK Team" }, "peerDependencies": { - "@adobe/react-native-aepcore": "1.0.0", + "@adobe/react-native-aepcore": "^1.0.0", "react-native": ">=0.60.0" } } \ No newline at end of file