@dynatrace/cordova-plugin 2.329.1 → 2.333.1

package/Package.swift

@@ -0,0 +1,32 @@
+// swift-tools-version: 5.9
+
+import PackageDescription
+
+let package = Package(
+    name: "DynatraceCordovaPlugin",
+    platforms: [.iOS(.v15)],
+    products: [
+        .library(
+            name: "DynatraceCordovaPlugin",
+            targets: ["DynatraceCordovaPlugin"]
+        )
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.1")
+    ],
+    targets: [
+        .target(
+            name: "DynatraceCordovaPlugin",
+            dependencies: [
+                .product(name: "Cordova", package: "capacitor-swift-pm"),
+                "Dynatrace"
+            ],
+            path: "ios",
+            publicHeadersPath: "."
+        ),
+        .binaryTarget(
+            name: "Dynatrace",
+            path: "files/iOS/Dynatrace.xcframework"
+        )
+    ]
+)

package/README.md

@@ -22,17 +22,19 @@ For information as to why this is necessary, read more [here](#migration-from-ma
   * Gradle version 7.x+ ([How to update?](#updating-to-gradle-7))
   * Android Gradle Plugin version 7.0+
   * Java 11
+  * Jetpack Compose 1.4 - 1.10 - see [Compose Compatibility Note](#compose-compatibility-note)
 * For iOS users: Minimum iOS 12
 * For JavaScript Agent: access to API of cluster
 * Node: >= 20.x
 * Cordova: 10+
+* Capacitor: 6+
 
 ## Agent Versions
 
 These agent versions are configured in this plugin:
 
-* Android Agent: 8.329.1.1014
-* iOS Agent: 8.329.1.1017
+* Android Agent: 8.333.1.1006
+* iOS Agent: 8.333.1.1005
 
 ## Quick Setup
 
@@ -81,6 +83,7 @@ These agent versions are configured in this plugin:
 * [Native OneAgent debug logs](#native-oneagent-debug-logs)
     * [Android](#android)
     * [iOS](#ios)
+* [Compose Compatibility Note](#compose-compatibility-note)
 * [Official documentation](#official-documentation)
 * [Doctor Dynatrace](#doctor-dynatrace)
 * [Instrumentation Overhead](#instrumentation-overhead)
@@ -140,6 +143,8 @@ This screen shows what a `combined` sample user session should roughly look like
 
 To instrument your Ionic Capacitor app, you will need to follow the steps below:
 
+**Note for Capacitor iOS:** Starting with Capacitor 8, new iOS projects by default use Swift Package Manager (SPM) instead of CocoaPods. The Dynatrace Cordova Plugin supports SPM based Cordova/Ionic + Capacitor projects. The steps are the same for both CocoaPods and SPM to setup/install the plugin.
+
 1. Install the Dynatrace Cordova Plugin via the following command:
 * `npm install @dynatrace/cordova-plugin`
 ** **Note:** If you do not want our plugin to modify your `package.json`, you can choose to opt-out of that process. See [opt-out](#opt-out) for more details.
@@ -152,25 +157,17 @@ hybridWebView {
     domains 'http://localhost', '.yourotherdomains.com'
 }
 ```
-5. Run the following commands (replace `<platform>` with `ios` or `android`):
-* For Capacitor version < 3.1 and Ionic CLI >= 6.x
-  * `ionic capacitor sync <platform>` 
+5. Run the following commands (replace `<platform>` with `ios` or `android`) for instrumentation:
+* If using **Ionic CLI**:
+  * `ionic capacitor run <platform>`
+  * `ionic capacitor sync <platform> && ionic capacitor open <platform>`
   * `ionic capacitor build <platform>`
-
-* For Capacitor version >= 3.1 use any of the following commands for instrumentation:
-  * If using **Ionic CLI**:
-    * `ionic capacitor run <platform>`
-    * `ionic capacitor sync <platform> && ionic capacitor open <platform>`
-    * `ionic capacitor build <platform>`
-  * If using **Capacitor CLI**:
-    * `capacitor run <platform>`
-    * `capacitor sync <platform> && capacitor open <platform>`
+* If using **Capacitor CLI**:
+  * `capacitor run <platform>`
+  * `capacitor sync <platform> && capacitor open <platform>`
 
 6. Run your application (if you did not use the **run** command)
 
-**Note:**
-Capacitor 3.1 added new hooks inside of their CLI. This allows us to instrument your application when using the `ionic capacitor run` or `capacitor run` commands. 
-
 ## Opt out
 
 You can opt-out of having your `package.json` modified by our plugin. By default, we add the hook required to properly instrument your application. To prevent issues with git, using this opt-out feature will no longer have our plugin modify your `package.json`. 
@@ -183,9 +180,9 @@ If using this feature, you will need to manually add the following hook to your
 ```js
 "scripts": {
 	...
-  // capacitor 3.0 or lower:
+  // Option 1 (if using ionic + capacitor)
   "ionic:capacitor:build:before": "node node_modules/@dynatrace/cordova-plugin/scripts/InstrumentCap.js"
-  // capacitor 3.1 or higher:
+  // Option 2 (if using cordova + capacitor or ionic + capacitor)
   "capacitor:sync:after": "node node_modules/@dynatrace/cordova-plugin/scripts/InstrumentCap.js"
 },
 ```
@@ -879,6 +876,41 @@ ios: {
 }
 ```
 
+## Compose Compatibility Note
+
+Our Android Agent currently supports **Jetpack Compose 1.4 - 1.10**. If you are using an incompatible version of Jetpack Compose, you may encounter the following error message during build:
+
+```
+Could not resolve all dependencies for configuration ':app:debugCompileClasspath'.
+Version '1.0.0' of artifact 'androidx.compose.material:material' is not supported.
+Please use the latest version of the Dynatrace Android Gradle plugin.
+```
+
+If you encounter compatibility issues or want to disable Jetpack Compose instrumentation, you can configure this in your `dynatrace.config.js` file. **Note: Disabling Jetpack Compose instrumentation will skip the compatibility check, allowing you to build with any version of Jetpack Compose without triggering version validation errors.**
+
+**Important**: The configuration example below shows **only the Compose-specific setting**. You must ensure that your complete `dynatrace.config.js` file includes all other required configuration settings (such as `beaconUrl`, `applicationId`, etc.) as described in the [Android block](#mobile-agent-configuration) section of this documentation.
+
+```js
+module.exports = {
+  // ...
+  android: {
+        config: `
+        dynatrace {
+            configurations {
+                defaultConfig {
+                    userActions {
+                        composeEnabled false
+                    }
+                }
+            }
+        }
+        `,
+  }
+};
+```
+
+For more information about Jetpack Compose instrumentation and monitoring capabilities, please refer to the [official Dynatrace documentation for Android OneAgent](https://docs.dynatrace.com/docs/observe/digital-experience/mobile-applications/instrument-android-app/instrumentation-via-plugin/monitoring-capabilities#compose-enable).
+
 ## Official documentation
 
   * Android Agent: https://www.dynatrace.com/support/help/technology-support/operating-systems/android/
@@ -943,6 +975,15 @@ When using Apple Pay with WKWebView, there are specific checks that WebKit (Appl
 
 ## Changelog
 
+2.333.1
+* Updated Android (8.333.1.1006) & iOS Agent (8.333.1.1005)
+* Dropped support for Capacitor 5 and lower as they are no longer supported [per Capacitor Support Status](https://capacitorjs.com/docs/main/reference/support-policy#capacitor-maintenance-and-support-status)
+
+2.331.1
+* Updated Android (8.331.1.1004) & iOS Agent (8.331.1.1008)
+* Added Swift Package Manager (SPM) support for Capacitor iOS projects
+* Added [Compose Compatibility Note](#compose-compatibility-note)
+
 2.329.1
 * Updated Android (8.329.1.1014) & iOS Agent (8.329.1.1017)
 * Updated logic for dynatraceMobile API for iOS to use messageHandler if there is no script injection in WKWebView (see [iOS only configuration](#ios-only-configuration))

package/files/iOS/Dynatrace.xcframework/Info.plist

@@ -8,15 +8,18 @@
 			<key>BinaryPath</key>
 			<string>Dynatrace.framework/Dynatrace</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -53,18 +56,15 @@
 			<key>BinaryPath</key>
 			<string>Dynatrace.framework/Dynatrace</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>ios</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>