Merge branch 'develop' into offlineStoragePOC

newrelic · Jan 5, 2024 · 69a40aa · 69a40aa
2 parents 2a641f0 + 0d876ec
commit 69a40aa
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 45 deletions.
diff --git a/.github/workflows/productionDeploy.yml b/.github/workflows/productionDeploy.yml
@@ -66,19 +66,19 @@ jobs:
     - name: Print XCFramework name
       run: echo "${{ env.version }}" 
 
-    # - name: Create Prod Podspec for XCFramework version
-    #   run: |
-    #      cd main
+    - name: Create Prod Podspec for XCFramework version
+      run: |
+         cd main
 
-    #      cp cocoapods/NewRelicAgent.podspec.template NewRelicAgent.podspec
-    #      REPLACE=X.XX
-    #      sed -i bak "s/$REPLACE/${{ env.version }}/g" NewRelicAgent.podspec
+         cp cocoapods/NewRelicAgent.podspec.template NewRelicAgent.podspec
+         REPLACE=X.XX
+         sed -i bak "s/$REPLACE/${{ env.version }}/g" NewRelicAgent.podspec
 
-    #      rm NewRelicAgent.podspecbak
+         rm NewRelicAgent.podspecbak
 
-    #      pod trunk push --allow-warnings NewRelicAgent.podspec
-    #   env:
-    #      COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+         pod trunk push --allow-warnings NewRelicAgent.podspec
+      env:
+         COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
 
     - name: Create Prod Package.swift for XCFramework version
       run: |

diff --git a/Agent.xcodeproj/project.pbxproj b/Agent.xcodeproj/project.pbxproj
@@ -4990,9 +4990,9 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7.4.7;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEVELOPMENT_TEAM = RQZ9D969HD;
-				DYLIB_CURRENT_VERSION = 7.4.7;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
@@ -5043,9 +5043,9 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7.4.7;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEVELOPMENT_TEAM = SU7SUNGZJP;
-				DYLIB_CURRENT_VERSION = 7.4.7;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
@@ -5118,10 +5118,10 @@
 				CODE_SIGN_IDENTITY = "Apple Development: [email protected] (3ZGR4484Y2)";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 7.4.7;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES;
-				DYLIB_CURRENT_VERSION = 7.4.7;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -5193,10 +5193,10 @@
 				CODE_SIGN_IDENTITY = "Apple Development: [email protected] (3ZGR4484Y2)";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 7.4.7;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES;
-				DYLIB_CURRENT_VERSION = 7.4.7;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -5237,12 +5237,12 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 7.4.8;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = SU7SUNGZJP;
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = SU7SUNGZJP;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 7.4.8;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5266,7 +5266,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.4.8;
+				MARKETING_VERSION = 7.4.9;
 				MODULEMAP_FILE = agent.modulemap;
 				OTHER_CFLAGS = "$(inherited";
 				OTHER_LDFLAGS = "";
@@ -5297,11 +5297,11 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 7.4.8;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = SU7SUNGZJP;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 7.4.8;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5323,7 +5323,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.4.8;
+				MARKETING_VERSION = 7.4.9;
 				MODULEMAP_FILE = agent.modulemap;
 				OTHER_CFLAGS = "$(inherited";
 				OTHER_LDFLAGS = "";
@@ -5348,9 +5348,9 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7.4.7;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEVELOPMENT_TEAM = RQZ9D969HD;
-				DYLIB_CURRENT_VERSION = 7.4.7;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
@@ -5405,9 +5405,9 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7.4.7;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEVELOPMENT_TEAM = SU7SUNGZJP;
-				DYLIB_CURRENT_VERSION = 7.4.7;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
@@ -5454,9 +5454,9 @@
 				CLANG_ENABLE_CODE_COVERAGE = YES;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7.4.7;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEVELOPMENT_TEAM = SU7SUNGZJP;
-				DYLIB_CURRENT_VERSION = 7.4.7;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				HEADER_SEARCH_PATHS = (
 					"${PROJECT_DIR}/UnitTests/",
 					"${SRCROOT}/**",
@@ -5493,9 +5493,9 @@
 				CLANG_ENABLE_CODE_COVERAGE = YES;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7.4.7;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEVELOPMENT_TEAM = SU7SUNGZJP;
-				DYLIB_CURRENT_VERSION = 7.4.7;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				HEADER_SEARCH_PATHS = (
 					"${PROJECT_DIR}/UnitTests/",
 					"${SRCROOT}/**",
@@ -5533,12 +5533,12 @@
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 7.4.8;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = SU7SUNGZJP;
 				"DEVELOPMENT_TEAM[sdk=appletvos*]" = SU7SUNGZJP;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 7.4.8;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5560,7 +5560,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.4.8;
+				MARKETING_VERSION = 7.4.9;
 				MODULEMAP_FILE = agent.modulemap;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent;
@@ -5586,11 +5586,11 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 7.4.8;
+				CURRENT_PROJECT_VERSION = 7.4.9;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = SU7SUNGZJP;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 7.4.8;
+				DYLIB_CURRENT_VERSION = 7.4.9;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5611,7 +5611,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.4.8;
+				MARKETING_VERSION = 7.4.9;
 				MODULEMAP_FILE = agent.modulemap;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent;

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem "fastlane"
+gem "fastlane", '2.216.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -212,7 +212,7 @@ PLATFORMS
   universal-darwin-22
 
 DEPENDENCIES
-  fastlane
+  fastlane (= 2.216.0)
 
 BUNDLED WITH
-   2.4.19
+   2.4.22
diff --git a/NewRelicAgent.podspec b/NewRelicAgent.podspec
@@ -1,12 +1,12 @@
 
 Pod::Spec.new do |s|
   s.name                   = "NewRelicAgent"
-  s.version                = "7.4.7-rc.589"
+  s.version                = "7.4.8"
   s.summary                = "Real-time performance data with your next iOS app release."
   s.homepage               = "http://newrelic.com/mobile-monitoring"
   s.license                = { :type => "Commercial", :file => "LICENSE" }
   s.author                 = { "New Relic, Inc." => "[email protected]" }
-  s.source                 = { :http => "https://download.newrelic.com/ios-v5/NewRelic_XCFramework_Agent_7.4.7-rc.589.zip" }
+  s.source                 = { :http => "https://download.newrelic.com/ios_agent/NewRelic_XCFramework_Agent_7.4.8.zip" }
   s.ios.deployment_target  = '9.0'
   s.tvos.deployment_target = '9.0'
   s.vendored_frameworks    = "NewRelic.xcframework"

diff --git a/Package.swift b/Package.swift
@@ -19,8 +19,8 @@ let package = Package(
             name: "NewRelicPackage",
             dependencies: []),
         .binaryTarget(name: "NewRelic",
-                      url: "https://download.newrelic.com/ios-v5/NewRelic_XCFramework_Agent_7.4.7-rc.589.zip",
-                      checksum: "4d5b8b8415d7e4d98fc12f1bf78347fe4f52c85bea0660be96c17d2a1a705752")
+                      url: "https://download.newrelic.com/ios_agent/NewRelic_XCFramework_Agent_7.4.8.zip",
+                      checksum: "96af08369f21b7c4b6b9ca5ea20d78752445f02d0223c44694012ad19530eba6")
     ]
 )