diff --git a/.npmignore b/.npmignore index 88d8472..c012b6d 100644 --- a/.npmignore +++ b/.npmignore @@ -1 +1,3 @@ -AppboyProject \ No newline at end of file +#sample apps +AppboyProject +HelloReact diff --git a/AppboyProject/.buckconfig b/AppboyProject/.buckconfig index 934256c..2ce91fb 100644 --- a/AppboyProject/.buckconfig +++ b/AppboyProject/.buckconfig @@ -1,6 +1,6 @@ [android] - target = Google Inc.:Google APIs:23 + target = Google Inc.:Google APIs:26 [maven_repositories] central = https://repo1.maven.org/maven2 diff --git a/AppboyProject/android/app/build.gradle b/AppboyProject/android/app/build.gradle index f04b424..816c88d 100644 --- a/AppboyProject/android/app/build.gradle +++ b/AppboyProject/android/app/build.gradle @@ -90,13 +90,13 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.0" defaultConfig { applicationId "com.appboyproject" minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 26 versionCode 1 versionName "1.0" ndk { @@ -135,7 +135,7 @@ android { dependencies { compile project(':react-native-appboy-sdk') compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:23.0.1" + compile "com.android.support:appcompat-v7:26.0.0" compile "com.facebook.react:react-native:+" // From node_modules } diff --git a/AppboyProject/android/app/src/main/res/values/appboy.xml b/AppboyProject/android/app/src/main/res/values/appboy.xml index 194d34b..77c4c8a 100644 --- a/AppboyProject/android/app/src/main/res/values/appboy.xml +++ b/AppboyProject/android/app/src/main/res/values/appboy.xml @@ -2,7 +2,8 @@ - 112c7859-2dff-4b38-ae3f-4869fa085e0b + 8220f3a6-2e82-4737-a83a-aab39eb1bcef + STAGING true diff --git a/AppboyProject/ios/AppboyProject.xcodeproj/project.pbxproj b/AppboyProject/ios/AppboyProject.xcodeproj/project.pbxproj index 3a1d876..5a2dbd1 100644 --- a/AppboyProject/ios/AppboyProject.xcodeproj/project.pbxproj +++ b/AppboyProject/ios/AppboyProject.xcodeproj/project.pbxproj @@ -213,6 +213,48 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RCTLinking; }; + 7FBF1B55203E5AE800C31E29 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3DBE0D001F3B181A0099AA32; + remoteInfo = fishhook; + }; + 7FBF1B57203E5AE800C31E29 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32; + remoteInfo = "fishhook-tvOS"; + }; + 7FBF1B69203E5AE800C31E29 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EBF21BDC1FC498900052F4D5; + remoteInfo = jsinspector; + }; + 7FBF1B6B203E5AE800C31E29 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5; + remoteInfo = "jsinspector-tvOS"; + }; + 7FBF1B6D203E5AE800C31E29 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9936F3131F5F2E4B0010BF04; + remoteInfo = privatedata; + }; + 7FBF1B6F203E5AE800C31E29 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04; + remoteInfo = "privatedata-tvOS"; + }; 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */; @@ -425,6 +467,8 @@ children = ( 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */, 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */, + 7FBF1B56203E5AE800C31E29 /* libfishhook.a */, + 7FBF1B58203E5AE800C31E29 /* libfishhook-tvOS.a */, ); name = Products; sourceTree = ""; @@ -455,10 +499,14 @@ 3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */, 3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */, 3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */, + 7FBF1B6A203E5AE800C31E29 /* libjsinspector.a */, + 7FBF1B6C203E5AE800C31E29 /* libjsinspector-tvOS.a */, D4B2E6121F7321720042E6A9 /* libthird-party.a */, D4B2E6141F7321720042E6A9 /* libthird-party.a */, D4B2E6161F7321720042E6A9 /* libdouble-conversion.a */, D4B2E6181F7321720042E6A9 /* libdouble-conversion.a */, + 7FBF1B6E203E5AE800C31E29 /* libprivatedata.a */, + 7FBF1B70203E5AE800C31E29 /* libprivatedata-tvOS.a */, ); name = Products; sourceTree = ""; @@ -672,11 +720,20 @@ DevelopmentTeam = 5GLZKGNWQ3; ProvisioningStyle = Manual; SystemCapabilities = { + com.apple.GameCenter = { + enabled = 0; + }; + com.apple.InAppPurchase = { + enabled = 0; + }; com.apple.Push = { enabled = 1; }; }; }; + 2D02E47A1E0B4A5D006451C7 = { + ProvisioningStyle = Manual; + }; }; }; buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "AppboyProject" */; @@ -923,6 +980,48 @@ remoteRef = 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 7FBF1B56203E5AE800C31E29 /* libfishhook.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libfishhook.a; + remoteRef = 7FBF1B55203E5AE800C31E29 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 7FBF1B58203E5AE800C31E29 /* libfishhook-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libfishhook-tvOS.a"; + remoteRef = 7FBF1B57203E5AE800C31E29 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 7FBF1B6A203E5AE800C31E29 /* libjsinspector.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libjsinspector.a; + remoteRef = 7FBF1B69203E5AE800C31E29 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 7FBF1B6C203E5AE800C31E29 /* libjsinspector-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsinspector-tvOS.a"; + remoteRef = 7FBF1B6B203E5AE800C31E29 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 7FBF1B6E203E5AE800C31E29 /* libprivatedata.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libprivatedata.a; + remoteRef = 7FBF1B6D203E5AE800C31E29 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 7FBF1B70203E5AE800C31E29 /* libprivatedata-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libprivatedata-tvOS.a"; + remoteRef = 7FBF1B6F203E5AE800C31E29 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 832341B51AAA6A8300B99B32 /* libRCTText.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1054,7 +1153,6 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-AppboyProject/Pods-AppboyProject-resources.sh", - "${PODS_ROOT}/Appboy-iOS-SDK/AppboyKit/Appboy.bundle", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/ABKModalFeedbackViewController.xib", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/ABKNavigationFeedbackViewController.xib", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/ar.lproj/AppboyFeedbackLocalizable.strings", @@ -1133,10 +1231,76 @@ "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/zh-HK.lproj", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/zh-TW.lproj", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/zh.lproj", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/ABKInAppMessageFullViewController.xib", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/ABKInAppMessageHTMLFullViewController.xib", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/ABKInAppMessageModalViewController.xib", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/ABKInAppMessageSlideupViewController.xib", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/arrow.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/arrow@2x.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/com_appboy_inapp_close_icon.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/com_appboy_inapp_close_icon@2x.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/com_appboy_inapp_close_icon@3x.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/FontAwesome.otf", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/SlideupArrow.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyKit/Appboy.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ABKModalFeedbackViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ABKNavigationFeedbackViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppboyFeedbackLocalizable.strings", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/checkmark-bg.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/checkmark-bg@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/checkmark.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/checkmark@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ar.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Base.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/da.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/de.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/en.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es-419.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es-MX.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/et.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fi.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fil.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fr.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/he.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/hi.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/id.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/it.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ja.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/km.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ko.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/lo.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ms.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/my.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nb.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nl.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pl.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt-PT.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ru.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/sv.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/th.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/vi.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hans.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hant.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-HK.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-TW.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ABKInAppMessageFullViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ABKInAppMessageHTMLFullViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ABKInAppMessageModalViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ABKInAppMessageSlideupViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/arrow.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/arrow@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/com_appboy_inapp_close_icon.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/com_appboy_inapp_close_icon@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/com_appboy_inapp_close_icon@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.otf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SlideupArrow.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Appboy.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1224,6 +1388,7 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; DEVELOPMENT_TEAM = 5GLZKGNWQ3; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1249,6 +1414,7 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = 5GLZKGNWQ3; INFOPLIST_FILE = AppboyProjectTests/Info.plist; @@ -1274,7 +1440,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AppboyProject/AppboyProject.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer: Appboy Appboy (QWFN3H2ZPW)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Appboy Appboy (QWFN3H2ZPW)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 5GLZKGNWQ3; @@ -1295,8 +1462,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.appboy.helloreact; PRODUCT_NAME = AppboyProject; - PROVISIONING_PROFILE = "f49bbdaa-5dcd-4f27-bb89-457ff9a5b06d"; - PROVISIONING_PROFILE_SPECIFIER = "match Development com.appboy.helloreact"; + PROVISIONING_PROFILE = "45b1f7df-eef1-458b-8139-7ff580e8e80b"; + PROVISIONING_PROFILE_SPECIFIER = "match AdHoc com.appboy.helloreact"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -1308,7 +1475,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AppboyProject/AppboyProject.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution: Appboy Inc. (5GLZKGNWQ3)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Appboy Inc. (5GLZKGNWQ3)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 5GLZKGNWQ3; HEADER_SEARCH_PATHS = ( @@ -1328,7 +1496,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.appboy.helloreact; PRODUCT_NAME = AppboyProject; - PROVISIONING_PROFILE = "a0d18b93-b072-4e3e-883d-470e6d4bc9a6"; + PROVISIONING_PROFILE = "45b1f7df-eef1-458b-8139-7ff580e8e80b"; PROVISIONING_PROFILE_SPECIFIER = "match AdHoc com.appboy.helloreact"; VERSIONING_SYSTEM = "apple-generic"; }; @@ -1343,7 +1511,9 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = ""; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "AppboyProject-tvOS/Info.plist"; @@ -1354,6 +1524,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.AppboyProject-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; @@ -1369,8 +1540,10 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = ""; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "AppboyProject-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1380,6 +1553,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.AppboyProject-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; diff --git a/AppboyProject/ios/AppboyProject.xcodeproj/xcshareddata/xcschemes/AppboyProject.xcscheme b/AppboyProject/ios/AppboyProject.xcodeproj/xcshareddata/xcschemes/AppboyProject.xcscheme index 9296859..f464326 100644 --- a/AppboyProject/ios/AppboyProject.xcodeproj/xcshareddata/xcschemes/AppboyProject.xcscheme +++ b/AppboyProject/ios/AppboyProject.xcodeproj/xcshareddata/xcschemes/AppboyProject.xcscheme @@ -81,9 +81,9 @@ - LSApplicationQueriesSchemes - - helloreact - - CFBundleURLTypes - - - CFBundleTypeRole - Editor - CFBundleURLSchemes - - helloreact - - - + Appboy + + Endpoint + sondheim.appboy.com + CFBundleDevelopmentRegion en CFBundleExecutable @@ -33,8 +23,23 @@ 1.0 CFBundleSignature ???? + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLSchemes + + helloreact + + + CFBundleVersion 1 + LSApplicationQueriesSchemes + + helloreact + LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/AppboyProject/ios/Podfile.lock b/AppboyProject/ios/Podfile.lock index 63c612d..d934a69 100644 --- a/AppboyProject/ios/Podfile.lock +++ b/AppboyProject/ios/Podfile.lock @@ -1,13 +1,19 @@ PODS: - - Appboy-iOS-SDK (3.1.0): - - Appboy-iOS-SDK/UI (= 3.1.0) - - Appboy-iOS-SDK/Core (3.1.0) - - Appboy-iOS-SDK/UI (3.1.0): + - Appboy-iOS-SDK (3.3.2): + - Appboy-iOS-SDK/UI (= 3.3.2) + - Appboy-iOS-SDK/Core (3.3.2) + - Appboy-iOS-SDK/Feedback (3.3.2): + - Appboy-iOS-SDK/Core + - Appboy-iOS-SDK/InAppMessage (3.3.2): - Appboy-iOS-SDK/Core - SDWebImage/GIF (~> 4.0) + - Appboy-iOS-SDK/UI (3.3.2): + - Appboy-iOS-SDK/Core + - Appboy-iOS-SDK/Feedback + - Appboy-iOS-SDK/InAppMessage - FLAnimatedImage (1.0.12) - - SDWebImage/Core (4.1.0) - - SDWebImage/GIF (4.1.0): + - SDWebImage/Core (4.3.0) + - SDWebImage/GIF (4.3.0): - FLAnimatedImage (~> 1.0) - SDWebImage/Core @@ -15,10 +21,10 @@ DEPENDENCIES: - Appboy-iOS-SDK SPEC CHECKSUMS: - Appboy-iOS-SDK: d840847796f07c5a7e8eb0f9dde717f406f709fa + Appboy-iOS-SDK: edd999ec1622a72b8ab5f5cabcc2887dd1ca18f3 FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31 - SDWebImage: 0e435c14e402a6730315a0fb79f95e68654d55a4 + SDWebImage: 6da6c8bca115addc4de8613362e1b15f66333825 -PODFILE CHECKSUM: cb85ec9cb3efbcd4ec24353dc3bbbfc0087f983b +PODFILE CHECKSUM: 6f16fd22978313a439eb0c3db2e35be41af25a47 -COCOAPODS: 1.3.1 +COCOAPODS: 1.4.0 diff --git a/AppboyProject/package.json b/AppboyProject/package.json index 111edff..5a1a0d7 100644 --- a/AppboyProject/package.json +++ b/AppboyProject/package.json @@ -6,8 +6,8 @@ "start": "node node_modules/react-native/local-cli/cli.js start" }, "dependencies": { - "react": "^16.0.0-alpha.12", - "react-native": "^0.48.3", + "react": "16.2.0", + "react-native": "^0.53.0", "react-native-appboy-sdk": "file:../" } } diff --git a/CHANGELOG.md b/CHANGELOG.md index 225052b..45b5594 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.5.0 + +##### Breaking +- Updated the native iOS bridge to [Appboy iOS SDK 3.0.0](https://github.com/Appboy/appboy-ios-sdk/releases/tag/3.0.0) or later. +- Updated the native Android bridge to [Appboy Android SDK 2.2.4](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md#224). +- Changed success callbacks on `submitFeedback()` on Android to always return `true` as `submitFeedback()` was changed to return `void` in the native SDK. + ## 1.4.1 ##### Added @@ -7,14 +14,13 @@ ## 1.4.0 ##### Breaking -- Updates the native iOS bridge to use [Appboy iOS SDK 2.31.0](https://github.com/Appboy/appboy-ios-sdk/releases/tag/2.31.0) or later. -- Updates the native Android bridge to use [Appboy Android SDK 2.1.4](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md#214). +- Updated the native iOS bridge to [Appboy iOS SDK 2.31.0](https://github.com/Appboy/appboy-ios-sdk/releases/tag/2.31.0) or later. +- Updated the native Android bridge to [Appboy Android SDK 2.1.4](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md#214). ##### Added - -- Adds `ReactAppboy.registerPushToken()` for registering push tokens with Appboy. +- Added `ReactAppboy.registerPushToken()` for registering push tokens with Appboy. - See https://github.com/Appboy/appboy-react-sdk/pull/13. Thanks @dcvz! -- Adds the local `react-native-appboy-sdk` Podspec for integrating the React Native iOS bridge via Cocoapods. +- Added the local `react-native-appboy-sdk` Podspec for integrating the React Native iOS bridge via Cocoapods. - See the new `HelloReact` sample app for an integration example. - See https://github.com/Appboy/appboy-react-sdk/pull/15. Thanks @pietropizzi! diff --git a/HelloReact/.buckconfig b/HelloReact/.buckconfig index 934256c..2ce91fb 100644 --- a/HelloReact/.buckconfig +++ b/HelloReact/.buckconfig @@ -1,6 +1,6 @@ [android] - target = Google Inc.:Google APIs:23 + target = Google Inc.:Google APIs:26 [maven_repositories] central = https://repo1.maven.org/maven2 diff --git a/HelloReact/android/app/build.gradle b/HelloReact/android/app/build.gradle index 874fdfa..d744456 100644 --- a/HelloReact/android/app/build.gradle +++ b/HelloReact/android/app/build.gradle @@ -90,13 +90,13 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.0" defaultConfig { applicationId "com.helloreact" minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 26 versionCode 1 versionName "1.0" ndk { @@ -135,7 +135,7 @@ android { dependencies { compile project(':react-native-appboy-sdk') compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:23.0.1" + compile "com.android.support:appcompat-v7:26.0.0" compile "com.facebook.react:react-native:+" // From node_modules } diff --git a/HelloReact/ios/HelloReact.xcodeproj/project.pbxproj b/HelloReact/ios/HelloReact.xcodeproj/project.pbxproj index 5d3e61c..9ae840c 100644 --- a/HelloReact/ios/HelloReact.xcodeproj/project.pbxproj +++ b/HelloReact/ios/HelloReact.xcodeproj/project.pbxproj @@ -957,7 +957,6 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-HelloReact/Pods-HelloReact-resources.sh", - "${PODS_ROOT}/Appboy-iOS-SDK/AppboyKit/Appboy.bundle", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/ABKModalFeedbackViewController.xib", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/ABKNavigationFeedbackViewController.xib", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/ar.lproj/AppboyFeedbackLocalizable.strings", @@ -1036,6 +1035,18 @@ "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/zh-HK.lproj", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/zh-TW.lproj", "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKFeedbackViewController/Feedback_Resources/zh.lproj", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/ABKInAppMessageFullViewController.xib", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/ABKInAppMessageHTMLFullViewController.xib", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/ABKInAppMessageModalViewController.xib", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/ABKInAppMessageSlideupViewController.xib", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/arrow.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/arrow@2x.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/com_appboy_inapp_close_icon.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/com_appboy_inapp_close_icon@2x.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/com_appboy_inapp_close_icon@3x.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/FontAwesome.otf", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/InAppMessage/Resources/SlideupArrow.png", + "${PODS_ROOT}/Appboy-iOS-SDK/AppboyKit/Appboy.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( diff --git a/HelloReact/ios/Podfile b/HelloReact/ios/Podfile index e3094d3..325de4e 100644 --- a/HelloReact/ios/Podfile +++ b/HelloReact/ios/Podfile @@ -8,5 +8,5 @@ target 'HelloReact' do 'RCTNetwork', 'RCTWebSocket' ] - pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga' + pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga' end diff --git a/HelloReact/ios/Podfile.lock b/HelloReact/ios/Podfile.lock index 84de147..8fe76bc 100644 --- a/HelloReact/ios/Podfile.lock +++ b/HelloReact/ios/Podfile.lock @@ -1,32 +1,43 @@ PODS: - - Appboy-iOS-SDK (3.1.0): - - Appboy-iOS-SDK/UI (= 3.1.0) - - Appboy-iOS-SDK/Core (3.1.0) - - Appboy-iOS-SDK/UI (3.1.0): + - Appboy-iOS-SDK (3.3.2): + - Appboy-iOS-SDK/UI (= 3.3.2) + - Appboy-iOS-SDK/Core (3.3.2) + - Appboy-iOS-SDK/Feedback (3.3.2): + - Appboy-iOS-SDK/Core + - Appboy-iOS-SDK/InAppMessage (3.3.2): - Appboy-iOS-SDK/Core - SDWebImage/GIF (~> 4.0) + - Appboy-iOS-SDK/UI (3.3.2): + - Appboy-iOS-SDK/Core + - Appboy-iOS-SDK/Feedback + - Appboy-iOS-SDK/InAppMessage - FLAnimatedImage (1.0.12) - - react-native-appboy-sdk (1.3.0): + - React (0.53.3): + - React/Core (= 0.53.3) + - react-native-appboy-sdk (1.4.0): - Appboy-iOS-SDK (~> 3.0) - - React/Core (0.48.3): - - Yoga (= 0.48.3.React) - - React/DevSupport (0.48.3): + - React + - React/Core (0.53.3): + - yoga (= 0.53.3.React) + - React/DevSupport (0.53.3): - React/Core - React/RCTWebSocket - - React/RCTBlob (0.48.3): + - React/fishhook (0.53.3) + - React/RCTBlob (0.53.3): - React/Core - - React/RCTNetwork (0.48.3): + - React/RCTNetwork (0.53.3): - React/Core - - React/RCTText (0.48.3): + - React/RCTText (0.53.3): - React/Core - - React/RCTWebSocket (0.48.3): + - React/RCTWebSocket (0.53.3): - React/Core + - React/fishhook - React/RCTBlob - - SDWebImage/Core (4.1.0) - - SDWebImage/GIF (4.1.0): + - SDWebImage/Core (4.3.0) + - SDWebImage/GIF (4.3.0): - FLAnimatedImage (~> 1.0) - SDWebImage/Core - - Yoga (0.48.3.React) + - yoga (0.53.3.React) DEPENDENCIES: - react-native-appboy-sdk (from `../node_modules/react-native-appboy-sdk`) @@ -35,24 +46,24 @@ DEPENDENCIES: - React/RCTNetwork (from `../node_modules/react-native`) - React/RCTText (from `../node_modules/react-native`) - React/RCTWebSocket (from `../node_modules/react-native`) - - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) + - yoga (from `../node_modules/react-native/ReactCommon/yoga`) EXTERNAL SOURCES: React: :path: ../node_modules/react-native react-native-appboy-sdk: :path: ../node_modules/react-native-appboy-sdk - Yoga: + yoga: :path: ../node_modules/react-native/ReactCommon/yoga SPEC CHECKSUMS: - Appboy-iOS-SDK: d840847796f07c5a7e8eb0f9dde717f406f709fa + Appboy-iOS-SDK: edd999ec1622a72b8ab5f5cabcc2887dd1ca18f3 FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31 - React: 748a63a3a08cef2864657ad752a5ca7393e07fc2 - react-native-appboy-sdk: 0abfbf9acb5d324a098ff6103e002e688fe37e07 - SDWebImage: 0e435c14e402a6730315a0fb79f95e68654d55a4 - Yoga: b3337798e426de90f48662cf0fe2ee1a844075e1 + React: fd20e9486c9d994fb6e40d6e67dbd29c7709889c + react-native-appboy-sdk: 9eff45df27ad1726518f19a9ab71a9c9ea343a12 + SDWebImage: 6da6c8bca115addc4de8613362e1b15f66333825 + yoga: c7c8e64dbc2552b1ceac0b491ff03f5e5128b501 -PODFILE CHECKSUM: 1c47ef13e4eeaec44ed71d3260b1fadd43fcdc40 +PODFILE CHECKSUM: 83ab0c1e4052d87bd06d28280828f7138834ef5c COCOAPODS: 1.3.1 diff --git a/HelloReact/package.json b/HelloReact/package.json index 657dc52..84b9b16 100644 --- a/HelloReact/package.json +++ b/HelloReact/package.json @@ -7,8 +7,8 @@ "test": "jest" }, "dependencies": { - "react": "16.0.0-alpha.12", - "react-native": "^0.48.3", + "react": "16.2.0", + "react-native": "^0.53.0", "react-native-appboy-sdk": "file:../" }, "devDependencies": { diff --git a/LICENSE.md b/LICENSE.md index da8483f..7221568 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2017 Braze, Inc. +Copyright (c) 2018 Braze, Inc. All rights reserved. * The use of source code or binaries contained within Braze's sample apps, documentation, stub APIs and other related utilities is permitted only to enable testing and quality assurance of integrations with the Braze platform by current customers of Braze. diff --git a/android/build.gradle b/android/build.gradle index 748ac31..1cc8180 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,18 +1,18 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.0" defaultConfig { minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 26 versionCode 1 versionName "1.0" } } dependencies { - compile 'com.appboy:android-sdk-ui:2.1.4' + compile 'com.appboy:android-sdk-ui:2.2.4' compile 'com.facebook.react:react-native:0.19.+' } diff --git a/android/src/main/java/com/appboy/reactbridge/AppboyReactBridge.java b/android/src/main/java/com/appboy/reactbridge/AppboyReactBridge.java index 352829a..9df0feb 100644 --- a/android/src/main/java/com/appboy/reactbridge/AppboyReactBridge.java +++ b/android/src/main/java/com/appboy/reactbridge/AppboyReactBridge.java @@ -130,8 +130,9 @@ public void logPurchase(String productIdentifier, String price, String currencyC @ReactMethod public void submitFeedback(String replyToEmail, String message, boolean isReportingABug, Callback callback) { - boolean result = Appboy.getInstance(getReactApplicationContext()).submitFeedback(replyToEmail, message, isReportingABug); - reportResultWithCallback(callback, null, result); + Appboy.getInstance(getReactApplicationContext()).submitFeedback(replyToEmail, message, isReportingABug); + // Always return true as Android doesn't support getting a result from submitFeedback(). + reportResultWithCallback(callback, null, true); } @ReactMethod diff --git a/package.json b/package.json index 410b555..ae68269 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "react-native-appboy-sdk", - "version": "1.4.1", - "description": "Appboy SDK for React Native.", + "version": "1.5.0", + "description": "Braze SDK for React Native.", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" @@ -12,6 +12,7 @@ }, "keywords": [ "appboy", + "braze", "react", "native", "react-native",