@capacitor/screen-reader 6.0.0-dev-1936-20231201T195954.0 → 6.0.0-dev-1933-20231204T092340.0

package/CapacitorScreenReader.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.homepage = 'https://capacitorjs.com'
   s.author = package['author']
   s.source = { :git => 'https://github.com/ionic-team/capacitor-plugins.git', :tag => package['name'] + '@' + package['version'] }
-  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}', 'screen-reader/ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}', 'screen-reader/ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '13.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'

package/android/build.gradle

@@ -15,7 +15,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0-rc02'
+        classpath 'com.android.tools.build:gradle:8.2.0'
         if (System.getenv("CAP_PLUGIN_PUBLISH") == "true") {
             classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
         }

package/ios/Plugin/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

package/ios/Plugin/ScreenReaderPlugin.h

@@ -0,0 +1,10 @@
+#import <UIKit/UIKit.h>
+
+//! Project version number for Plugin.
+FOUNDATION_EXPORT double PluginVersionNumber;
+
+//! Project version string for Plugin.
+FOUNDATION_EXPORT const unsigned char PluginVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
+

package/ios/Plugin/ScreenReaderPlugin.m

@@ -0,0 +1,9 @@
+#import <Foundation/Foundation.h>
+#import <Capacitor/Capacitor.h>
+
+// Define the plugin using the CAP_PLUGIN Macro, and
+// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
+CAP_PLUGIN(ScreenReaderPlugin, "ScreenReader",
+           CAP_PLUGIN_METHOD(speak, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(isEnabled, CAPPluginReturnPromise);
+)

package/ios/{Sources/ScreenReaderPlugin → Plugin}/ScreenReaderPlugin.swift

@@ -2,13 +2,7 @@ import Foundation
 import Capacitor
 
 @objc(ScreenReaderPlugin)
-public class ScreenReaderPlugin: CAPPlugin, CAPBridgedPlugin {
-    public let identifier = "ScreenReaderPlugin" 
-    public let jsName = "ScreenReader" 
-    public let pluginMethods: [CAPPluginMethod] = [
-        CAPPluginMethod(name: "speak", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "isEnabled", returnType: CAPPluginReturnPromise),
-    ] 
+public class ScreenReaderPlugin: CAPPlugin {
     static let stateChangeEvent = "stateChange"
 
     override public func load() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/screen-reader",
-  "version": "6.0.0-dev-1936-20231201T195954.0",
+  "version": "6.0.0-dev-1933-20231204T092340.0",
   "description": "The Screen Reader API provides access to TalkBack/VoiceOver/etc. and provides simple text-to-speech capabilities for visual accessibility.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -10,9 +10,7 @@
     "android/src/main/",
     "android/build.gradle",
     "dist/",
-    "ios/Sources/",
-    "ios/Tests",
-    "Package.swift",
+    "ios/Plugin/",
     "CapacitorScreenReader.podspec"
   ],
   "author": "Ionic <hi@ionicframework.com>",
@@ -31,7 +29,7 @@
   ],
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "xcodebuild build -scheme CapacitorScreenReader -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'",
+    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin -destination generic/platform=iOS && cd ..",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",

package/Package.swift

@@ -1,28 +0,0 @@
-// swift-tools-version: 5.9
-import PackageDescription
-
-let package = Package(
-    name: "CapacitorScreenReader",
-    platforms: [.iOS(.v13)],
-    products: [
-        .library(
-            name: "ScreenReaderPlugin",
-            targets: ["ScreenReaderPlugin"])
-    ],
-    dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main")
-    ],
-    targets: [
-        .target(
-            name: "ScreenReaderPlugin",
-            dependencies: [
-                .product(name: "Capacitor", package: "capacitor6-spm-test"),
-                .product(name: "Cordova", package: "capacitor6-spm-test")
-            ],
-            path: "ios/Sources/ScreenReaderPlugin"),
-        .testTarget(
-            name: "ScreenReaderPluginTests",
-            dependencies: ["ScreenReaderPlugin"],
-            path: "ios/Tests/ScreenReaderPluginTests")
-    ]
-)

package/ios/Tests/ScreenReaderPluginTests/PluginTests.swift

@@ -1,16 +0,0 @@
-import XCTest
-@testable import ScreenReaderPlugin
-
-class ScreenReaderTests: XCTestCase {
-
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-
-}