@wwdrew/expo-spotify-sdk 2.2.1 → 2.2.2

package/README.md

@@ -103,7 +103,7 @@ For bare React Native (no Expo CLI), see [Installation in bare React Native](#in
 
 | Platform | Distribution |
 | --- | --- |
-| **iOS** | `SpotifyiOS` resolved from Spotify's GitHub via SPM at `pod install` ([ADR-0008](./docs/adr/0008-ios-spotify-sdk-via-spm.md)). Uses React Native's `spm_dependency` (RN 0.75+). Supported Expo SDK lanes: [Platform support](#platform-support). |
+| **iOS** | `SpotifyiOS` downloaded via CocoaPods HTTP binary pod at `pod install` ([ADR-0009](./docs/adr/0009-ios-spotify-sdk-via-cocoapods-binary-pod.md)). Config plugin injects the Podfile `pod` line on `expo prebuild`. Supported Expo SDK lanes: [Platform support](#platform-support). |
 | **Android** | App Remote AAR downloaded from Spotify's GitHub at Gradle build. Auth SDK from Maven Central. |
 
 | You are… | Action |
@@ -127,10 +127,11 @@ yarn add @wwdrew/expo-spotify-sdk expo-modules-core
 
 ### 2. iOS
 
-Add the pod to your `Podfile`:
+Add pods to your `Podfile`:
 
 ```ruby
 pod 'ExpoSpotifySDK', :path => '../node_modules/@wwdrew/expo-spotify-sdk'
+pod 'SpotifyiOS', :podspec => File.join(__dir__, '../node_modules/@wwdrew/expo-spotify-sdk/spotify-ios/SpotifyiOS.podspec')
 ```
 
 Then install pods:

package/android/src/main/java/expo/modules/spotifysdk/ExpoSpotifySDKModule.kt

@@ -8,7 +8,7 @@ import expo.modules.kotlin.functions.Coroutine
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
-private const val SDK_VERSION = "2.2.1" // x-release-please-version
+private const val SDK_VERSION = "2.2.2" // x-release-please-version
 private const val EVENT_SESSION_CHANGE = "onSessionChange"
 private const val EVENT_CONNECTION_STATE_CHANGE = "onConnectionStateChange"
 private const val EVENT_CONNECTION_ERROR = "onConnectionError"

package/expo-module.config.json

@@ -2,7 +2,8 @@
   "platforms": ["ios", "android", "web"],
   "ios": {
     "modules": ["ExpoSpotifySDKModule"],
-    "appDelegateSubscribers": ["ExpoSpotifyAppDelegate"]
+    "appDelegateSubscribers": ["ExpoSpotifyAppDelegate"],
+    "podspecPath": "ios/ExpoSpotifySDK.podspec"
   },
   "android": {
     "modules": ["expo.modules.spotifysdk.ExpoSpotifySDKModule"]

package/ios/ExpoSpotifySDK.podspec

@@ -1,18 +1,6 @@
 require 'json'
 
-absolute_react_native_path = ''
-if !ENV['REACT_NATIVE_PATH'].nil?
-  absolute_react_native_path = File.expand_path(ENV['REACT_NATIVE_PATH'], Pod::Config.instance.project_root)
-else
-  absolute_react_native_path = File.dirname(`node --print "require.resolve('react-native/package.json')"`)
-end
-
-unless defined?(spm_dependency)
-  require File.join(absolute_react_native_path, "scripts/react_native_pods")
-end
-
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
-spotify_native = JSON.parse(File.read(File.join(__dir__, 'spotify-native-sdk-versions.json')))
 
 Pod::Spec.new do |s|
   s.name           = 'ExpoSpotifySDK'
@@ -28,6 +16,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
+  s.dependency 'SpotifyiOS'
 
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
@@ -35,18 +24,4 @@ Pod::Spec.new do |s|
   }
 
   s.source_files = "**/*.{h,m,swift}"
-
-  ios_sdk = spotify_native['ios']
-  if ios_sdk.nil? ||
-      ios_sdk['spmRepositoryUrl'].to_s.empty? ||
-      ios_sdk['spmVersion'].to_s.empty? ||
-      ios_sdk['spmProduct'].to_s.empty?
-    raise "ios/spotify-native-sdk-versions.json is missing required iOS fields: spmRepositoryUrl, spmVersion, spmProduct"
-  end
-
-  spm_dependency(s,
-    url: ios_sdk['spmRepositoryUrl'],
-    requirement: { kind: 'exactVersion', version: ios_sdk['spmVersion'] },
-    products: [ios_sdk['spmProduct']]
-  )
 end

package/ios/ExpoSpotifySDKModule.swift

@@ -1,7 +1,7 @@
 import ExpoModulesCore
 import SpotifyiOS
 
-private let SDK_VERSION = "2.2.1" // x-release-please-version
+private let SDK_VERSION = "2.2.2" // x-release-please-version
 private let EVENT_SESSION_CHANGE = "onSessionChange"
 private let EVENT_CONNECTION_STATE_CHANGE = "onConnectionStateChange"
 private let EVENT_CONNECTION_ERROR = "onConnectionError"

package/ios/spotify-native-sdk-versions.json

@@ -1,8 +1,8 @@
 {
   "ios": {
-    "spmRepositoryUrl": "https://github.com/spotify/ios-sdk.git",
-    "spmVersion": "5.0.1",
-    "spmProduct": "SpotifyiOS"
+    "version": "5.0.1",
+    "tarballSha256": "acafc07d35ce3f0bce93cac0031cd1cca1ba7ba6647a3e07e123f2e954ec298b",
+    "binarySha256": "988704167a3839136c7a4fd83742fca1422dfad48de41354ed07aa8e47611e32"
   },
   "android": {
     "appRemoteVersion": "0.8.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwdrew/expo-spotify-sdk",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Expo module wrapping the native Spotify iOS (v5) and Android (v4) SDKs for OAuth authentication and App Remote playback control",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -20,7 +20,7 @@
     "clean": "rm -rf build plugin/build android/build",
     "lint": "eslint src",
     "test": "jest --config jest.config.js",
-    "prepublishOnly": "yarn clean && yarn build && yarn build:plugin",
+    "prepublishOnly": "yarn clean && yarn build && yarn build:plugin && bash scripts/verify-npm-pack.sh",
     "typecheck": "tsc --noEmit",
     "open:ios": "open -a \"Xcode\" example/ios",
     "open:android": "open -a \"Android Studio\" example/android"
@@ -43,6 +43,7 @@
     "android/src",
     "android/libs/SETUP.md",
     "ios/spotify-native-sdk-versions.json",
+    "spotify-ios/SpotifyiOS.podspec",
     "ios/*.swift",
     "ios/*.podspec",
     "app.plugin.js",

package/plugin/build/ios/withSpotifyIosPod.d.ts

@@ -0,0 +1,9 @@
+import { ConfigPlugin } from "@expo/config-plugins";
+export declare const PODFILE_SPOTIFY_IOS_TAG = "expo-spotify-sdk-spotify-ios-pod";
+/**
+ * Standard CocoaPods binary pod — SpotifyiOS.podspec uses `source: { http: ... }`
+ * so CocoaPods downloads and runs `prepare_command` (unlike `:path` pods).
+ */
+export declare const PODFILE_SPOTIFY_IOS_POD = "  pod 'SpotifyiOS', :podspec => File.join(__dir__, '../node_modules/@wwdrew/expo-spotify-sdk/spotify-ios/SpotifyiOS.podspec')";
+export declare function applySpotifyIosPod(podfileContents: string): string;
+export declare const withSpotifyIosPod: ConfigPlugin;

package/plugin/build/ios/withSpotifyIosPod.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withSpotifyIosPod = exports.PODFILE_SPOTIFY_IOS_POD = exports.PODFILE_SPOTIFY_IOS_TAG = void 0;
+exports.applySpotifyIosPod = applySpotifyIosPod;
+const config_plugins_1 = require("@expo/config-plugins");
+const generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
+exports.PODFILE_SPOTIFY_IOS_TAG = "expo-spotify-sdk-spotify-ios-pod";
+/**
+ * Standard CocoaPods binary pod — SpotifyiOS.podspec uses `source: { http: ... }`
+ * so CocoaPods downloads and runs `prepare_command` (unlike `:path` pods).
+ */
+exports.PODFILE_SPOTIFY_IOS_POD = `  pod 'SpotifyiOS', :podspec => File.join(__dir__, '../node_modules/@wwdrew/expo-spotify-sdk/spotify-ios/SpotifyiOS.podspec')`;
+function applySpotifyIosPod(podfileContents) {
+    const merged = (0, generateCode_1.mergeContents)({
+        tag: exports.PODFILE_SPOTIFY_IOS_TAG,
+        src: podfileContents,
+        newSrc: exports.PODFILE_SPOTIFY_IOS_POD,
+        anchor: /use_expo_modules!/,
+        offset: 1,
+        comment: "#",
+    });
+    return merged.didMerge || merged.didClear
+        ? merged.contents
+        : podfileContents;
+}
+const withSpotifyIosPod = (config) => {
+    return (0, config_plugins_1.withPodfile)(config, (config) => {
+        config.modResults.contents = applySpotifyIosPod(config.modResults.contents);
+        return config;
+    });
+};
+exports.withSpotifyIosPod = withSpotifyIosPod;

package/plugin/build/withSpotifySdkConfig.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withSpotifySdkConfig = void 0;
 const withSpotifyAndroidAppBuildGradle_1 = require("./android/withSpotifyAndroidAppBuildGradle");
 const withSpotifyConfigValues_1 = require("./ios/withSpotifyConfigValues");
+const withSpotifyIosPod_1 = require("./ios/withSpotifyIosPod");
 const withSpotifyQueryScheme_1 = require("./ios/withSpotifyQueryScheme");
 const withSpotifyURLScheme_1 = require("./ios/withSpotifyURLScheme");
 const withSpotifySdkConfig = (config, spotifyConfig) => {
@@ -18,6 +19,7 @@ const withSpotifySdkConfig = (config, spotifyConfig) => {
     // Android specific
     config = (0, withSpotifyAndroidAppBuildGradle_1.withSpotifyAndroidAppBuildGradle)(config, spotifyConfig);
     // iOS specific
+    config = (0, withSpotifyIosPod_1.withSpotifyIosPod)(config);
     config = (0, withSpotifyConfigValues_1.withSpotifyConfigValues)(config, spotifyConfig);
     config = (0, withSpotifyQueryScheme_1.withSpotifyQueryScheme)(config, spotifyConfig);
     config = (0, withSpotifyURLScheme_1.withSpotifyURLScheme)(config, spotifyConfig);

package/spotify-ios/SpotifyiOS.podspec

@@ -0,0 +1,37 @@
+require 'json'
+
+pins = JSON.parse(File.read(File.join(__dir__, '..', 'ios', 'spotify-native-sdk-versions.json')))['ios']
+version = pins['version']
+tag = "v#{version}"
+
+Pod::Spec.new do |s|
+  s.name             = 'SpotifyiOS'
+  s.version          = version
+  s.summary          = 'Spotify iOS SDK (binary pod for @wwdrew/expo-spotify-sdk)'
+  s.homepage         = 'https://github.com/spotify/ios-sdk'
+  s.license          = { :type => 'Proprietary' }
+  s.author           = 'Spotify'
+  s.platform         = :ios, '16.4'
+  s.static_framework = true
+
+  s.source = {
+    :http => "https://github.com/spotify/ios-sdk/archive/refs/tags/#{tag}.tar.gz",
+  }
+
+  s.prepare_command = <<-CMD
+    set -e
+    if [ ! -d SpotifyiOS.xcframework ]; then
+      framework="$(find . -name 'SpotifyiOS.xcframework' -type d | head -1)"
+      test -n "$framework"
+      mv "$framework" .
+    fi
+    if [ ! -d Licenses ]; then
+      licenses="$(find . -path '*/Licenses' -type d | head -1)"
+      if [ -n "$licenses" ]; then mv "$licenses" .; fi
+    fi
+    find . -mindepth 1 -maxdepth 1 ! -name 'SpotifyiOS.xcframework' ! -name 'Licenses' -exec rm -rf {} +
+  CMD
+
+  s.vendored_frameworks = 'SpotifyiOS.xcframework'
+  s.preserve_paths = 'Licenses'
+end