diff --git a/NewRelicExampleApp/React-Native-Test-App/android/app/build.gradle b/NewRelicExampleApp/React-Native-Test-App/android/app/build.gradle index 25ae62d..3ef19bc 100644 --- a/NewRelicExampleApp/React-Native-Test-App/android/app/build.gradle +++ b/NewRelicExampleApp/React-Native-Test-App/android/app/build.gradle @@ -153,7 +153,7 @@ dependencies { // The version of react-native is set by the React Native Gradle Plugin implementation("com.facebook.react:react-android") - implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { diff --git a/NewRelicExampleApp/React-Native-Test-App/android/build.gradle b/NewRelicExampleApp/React-Native-Test-App/android/build.gradle index 8a47cbc..4a50a02 100644 --- a/NewRelicExampleApp/React-Native-Test-App/android/build.gradle +++ b/NewRelicExampleApp/React-Native-Test-App/android/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { buildToolsVersion = "33.0.0" - minSdkVersion = 21 + minSdkVersion = 24 compileSdkVersion = 33 targetSdkVersion = 33 @@ -15,7 +15,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.3.1") + classpath("com.android.tools.build:gradle:7.4.2") classpath("com.facebook.react:react-native-gradle-plugin") classpath "com.newrelic.agent.android:agent-gradle-plugin:7.0.0" } diff --git a/NewRelicExampleApp/React-Native-Test-App/android/gradle/wrapper/gradle-wrapper.properties b/NewRelicExampleApp/React-Native-Test-App/android/gradle/wrapper/gradle-wrapper.properties index 8fad3f5..92492e3 100644 --- a/NewRelicExampleApp/React-Native-Test-App/android/gradle/wrapper/gradle-wrapper.properties +++ b/NewRelicExampleApp/React-Native-Test-App/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri Aug 18 10:11:43 CDT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/NewRelicExampleApp/React-Native-Test-App/android/settings.gradle b/NewRelicExampleApp/React-Native-Test-App/android/settings.gradle index c587703..827af1f 100644 --- a/NewRelicExampleApp/React-Native-Test-App/android/settings.gradle +++ b/NewRelicExampleApp/React-Native-Test-App/android/settings.gradle @@ -1,4 +1,5 @@ rootProject.name = 'AwesomeProject' -apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) +apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); +applyNativeModulesSettingsGradle(settings) include ':app' includeBuild('../node_modules/react-native-gradle-plugin') diff --git a/NewRelicExampleApp/React-Native-Test-App/ios/AwesomeProject-Bridging-Header.h b/NewRelicExampleApp/React-Native-Test-App/ios/AwesomeProject-Bridging-Header.h new file mode 100644 index 0000000..1b2cb5d --- /dev/null +++ b/NewRelicExampleApp/React-Native-Test-App/ios/AwesomeProject-Bridging-Header.h @@ -0,0 +1,4 @@ +// +// Use this file to import your target's public headers that you would like to expose to Swift. +// + diff --git a/NewRelicExampleApp/React-Native-Test-App/ios/AwesomeProject.xcodeproj/project.pbxproj b/NewRelicExampleApp/React-Native-Test-App/ios/AwesomeProject.xcodeproj/project.pbxproj index bbd7fc6..7798780 100644 --- a/NewRelicExampleApp/React-Native-Test-App/ios/AwesomeProject.xcodeproj/project.pbxproj +++ b/NewRelicExampleApp/React-Native-Test-App/ios/AwesomeProject.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 6415DC792A94FA9B001BAA68 /* Test.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6415DC782A94FA9B001BAA68 /* Test.swift */; }; 7699B88040F8A987B510C191 /* libPods-AwesomeProject-AwesomeProjectTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-AwesomeProject-AwesomeProjectTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; /* End PBXBuildFile section */ @@ -41,6 +42,8 @@ 5709B34CF0A7D63546082F79 /* Pods-AwesomeProject.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject.release.xcconfig"; path = "Target Support Files/Pods-AwesomeProject/Pods-AwesomeProject.release.xcconfig"; sourceTree = ""; }; 5B7EB9410499542E8C5724F5 /* Pods-AwesomeProject-AwesomeProjectTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject-AwesomeProjectTests.debug.xcconfig"; path = "Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests.debug.xcconfig"; sourceTree = ""; }; 5DCACB8F33CDC322A6C60F78 /* libPods-AwesomeProject.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AwesomeProject.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6415DC772A94FA9A001BAA68 /* AwesomeProject-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AwesomeProject-Bridging-Header.h"; sourceTree = ""; }; + 6415DC782A94FA9B001BAA68 /* Test.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Test.swift; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = AwesomeProject/LaunchScreen.storyboard; sourceTree = ""; }; 89C6BE57DB24E9ADA2F236DE /* Pods-AwesomeProject-AwesomeProjectTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject-AwesomeProjectTests.release.xcconfig"; path = "Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests.release.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; @@ -92,6 +95,8 @@ 13B07FB61A68108700A75B9A /* Info.plist */, 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */, 13B07FB71A68108700A75B9A /* main.m */, + 6415DC782A94FA9B001BAA68 /* Test.swift */, + 6415DC772A94FA9A001BAA68 /* AwesomeProject-Bridging-Header.h */, ); name = AwesomeProject; sourceTree = ""; @@ -207,7 +212,7 @@ TestTargetID = 13B07F861A680F5B00A75B9A; }; 13B07F861A680F5B00A75B9A = { - LastSwiftMigration = 1120; + LastSwiftMigration = 1430; }; }; }; @@ -414,6 +419,7 @@ files = ( 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */, 13B07FC11A68108700A75B9A /* main.m in Sources */, + 6415DC792A94FA9B001BAA68 /* Test.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -432,6 +438,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-AwesomeProject-AwesomeProjectTests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -459,6 +466,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-AwesomeProject-AwesomeProjectTests.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; INFOPLIST_FILE = AwesomeProjectTests/Info.plist; @@ -500,6 +508,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = AwesomeProject; + SWIFT_OBJC_BRIDGING_HEADER = "AwesomeProject-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -526,6 +535,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = AwesomeProject; + SWIFT_OBJC_BRIDGING_HEADER = "AwesomeProject-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; diff --git a/NewRelicExampleApp/React-Native-Test-App/ios/Podfile.lock b/NewRelicExampleApp/React-Native-Test-App/ios/Podfile.lock index 7c3e9af..b651288 100644 --- a/NewRelicExampleApp/React-Native-Test-App/ios/Podfile.lock +++ b/NewRelicExampleApp/React-Native-Test-App/ios/Podfile.lock @@ -77,10 +77,10 @@ PODS: - hermes-engine/Pre-built (= 0.71.10) - hermes-engine/Pre-built (0.71.10) - libevent (2.1.12) - - newrelic-react-native-agent (1.2.1): - - NewRelicAgent (= 7.4.5) + - newrelic-react-native-agent (1.3.1): + - NewRelicAgent (= 7.4.6) - React - - NewRelicAgent (7.4.5) + - NewRelicAgent (7.4.6) - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): - boost @@ -333,13 +333,9 @@ PODS: - React-jsinspector (0.71.10) - React-logger (0.71.10): - glog - - react-native-safe-area-context (4.5.3): - - RCT-Folly - - RCTRequired - - RCTTypeSafety + - react-native-safe-area-context (4.7.1): - React-Core - - ReactCommon/turbomodule/core - - react-native-webview (13.2.1): + - react-native-webview (13.3.1): - React-Core - React-perflogger (0.71.10) - React-RCTActionSheet (0.71.10): @@ -425,7 +421,7 @@ PODS: - React-jsi (= 0.71.10) - React-logger (= 0.71.10) - React-perflogger (= 0.71.10) - - RNScreens (3.20.0): + - RNScreens (3.24.0): - React-Core - React-RCTImage - SocketRocket (0.6.0) @@ -614,8 +610,8 @@ SPEC CHECKSUMS: glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b hermes-engine: d27603b55a48402501ad1928c05411dae9cd6b85 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - newrelic-react-native-agent: f85eed69d410072996a1871be85fee828aa9ad09 - NewRelicAgent: ac619f4d5719d2fe1f95245b77cbacd4a63a1dac + newrelic-react-native-agent: d5896c50174a75b368923b53e0ccbf42ae36f737 + NewRelicAgent: 3ed420a7faa830ca891d6d037d592fa5d680e744 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 8ef706f91e2b643cd32c26a57700b5f24fab0585 @@ -631,8 +627,8 @@ SPEC CHECKSUMS: React-jsiexecutor: 4bb480a183a354e4dbfb1012936b1a2bb9357de7 React-jsinspector: cdc854f8b13abd202afa54bc12578e5afb9cfae1 React-logger: ef2269b3afa6ba868da90496c3e17a4ec4f4cee0 - react-native-safe-area-context: b8979f5eda6ed5903d4dbc885be3846ea3daa753 - react-native-webview: 289700225ad0377cc6897b59724dfee8af515bf9 + react-native-safe-area-context: 9697629f7b2cda43cf52169bb7e0767d330648c2 + react-native-webview: c2b70afb1d910cdd8810375aecc6c2894e2ba061 React-perflogger: 217095464d5c4bb70df0742fa86bf2a363693468 React-RCTActionSheet: 8deae9b85a4cbc6a2243618ea62a374880a2c614 React-RCTAnimation: 59c62353a8b59ce206044786c5d30e4754bffa64 @@ -646,7 +642,7 @@ SPEC CHECKSUMS: React-RCTVibration: d13cc2d63286c633393d3a7f6f607cc2a09ec011 React-runtimeexecutor: a9a1cd79996c9a0846e3232ecb25c64e1cc0172e ReactCommon: 65718685d4095d06b4b1af8042e12f1df2925c31 - RNScreens: 218801c16a2782546d30bd2026bb625c0302d70f + RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: e7ea9e590e27460d28911403b894722354d73479 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/NewRelicExampleApp/React-Native-Test-App/ios/Test.swift b/NewRelicExampleApp/React-Native-Test-App/ios/Test.swift new file mode 100644 index 0000000..5d8e6a5 --- /dev/null +++ b/NewRelicExampleApp/React-Native-Test-App/ios/Test.swift @@ -0,0 +1,11 @@ +// +// Test.swift +// AwesomeProject +// +// Created by Nisarg Desai on 8/22/23. +// + +import Foundation +import NewRelic + +NewRelic.rem diff --git a/NewRelicExampleApp/React-Native-Test-App/package.json b/NewRelicExampleApp/React-Native-Test-App/package.json index cb730a2..8671037 100644 --- a/NewRelicExampleApp/React-Native-Test-App/package.json +++ b/NewRelicExampleApp/React-Native-Test-App/package.json @@ -16,7 +16,7 @@ "moment": "^2.29.4", "newrelic-react-native-agent": "^1.2.1", "react": "18.2.0", - "react-native": "0.71.10", + "react-native": "0.72.4", "react-native-safe-area-context": "^4.5.3", "react-native-screens": "^3.20.0", "react-native-webview": "^13.2.1" diff --git a/package.json b/package.json index c08bc05..9b944b5 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ }, "dependencies": { "@expo/config-plugins": "^7.2.2", + "@react-native-community/cli-platform-android": "^11.3.7", "lodash.foreach": "^4.5.0", "react-native-promise-rejection-utils": "0.0.1" }, @@ -95,7 +96,7 @@ }, "android": { "newrelic": "7.0.0", - "ndk":"1.0.3" + "ndk": "1.0.3" } } }