Merge branch '383-revert-release-25-0-1-and-fix-ikigajson-dependency' into 'master'

carlocoder · carlocoder · commit 520639ee9712 · 2025-08-21T08:42:35.000Z
Resolve "Revert release 25.0.1 and fix ikigajson dependency"

Closes #383

See merge request pace/mobile/ios/pace-cloud-sdk!440
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,19 +1,3 @@
-25.1.0 Release notes (2025-08-20)
-=============================================================
-
-### Enhancements
-
-* Introduce IkigaJSON
-
-### Fixes
-
-* Fix app drawer layout
-
-### Internal
-
-* Remove warning if custom oid configuration is nil
-* Bump version to 25.0.0
-
 25.0.0 Release notes (2025-04-23)
 =============================================================
 
diff --git a/PACECloudSDK.podspec b/PACECloudSDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name                 = "PACECloudSDK"
-  spec.version              = "25.1.0"
+  spec.version              = "25.0.0"
   spec.summary              = "Easily integrate your app with the PACE API to support Connected Fueling"
   spec.homepage             = "http://github.com/pace/cloud-sdk-ios"
   spec.license              = { :type => "MIT", :file => "LICENSE.md" }
diff --git a/PACECloudSDK.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PACECloudSDK.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/PACECloudSDK/Info.plist b/PACECloudSDK/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>25.1.0</string>
+	<string>25.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>UIAppFonts</key>
diff --git a/PACECloudSDK/Utils/Plists/FallbackVersions.plist b/PACECloudSDK/Utils/Plists/FallbackVersions.plist
@@ -5,6 +5,6 @@
 	<key>BuildVersion</key>
 	<string>1</string>
 	<key>ReleaseVersion</key>
-	<string>25.1.0</string>
+	<string>25.0.0</string>
 </dict>
 </plist>
diff --git a/PACECloudSDKTests/Info.plist b/PACECloudSDKTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>25.1.0</string>
+	<string>25.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>
diff --git a/PACECloudSlimSDK/Info.plist b/PACECloudSlimSDK/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>25.1.0</string>
+	<string>25.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>UIAppFonts</key>
diff --git a/PACECloudWatchSDK/Info.plist b/PACECloudWatchSDK/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>25.1.0</string>
+	<string>25.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
diff --git a/Package.swift b/Package.swift
@@ -54,13 +54,13 @@ let package = Package(
             ]),
         .binaryTarget(
             name: "PACECloudSlimSDK",
-            url: "https://github.com/pace/cloud-sdk-ios/releases/download/25.1.0/PACECloudSlimSDK.zip",
-            checksum: "a439082b91ad3a288561229d4d3d4a225873ebb59e31c33d6835ad3fa52095c2"
+            url: "https://github.com/pace/cloud-sdk-ios/releases/download/25.0.0/PACECloudSlimSDK.zip",
+            checksum: "5bf1d41cfaf21c65a86929a28c1f967d805a06e9a14c18a9cefe96219a9abecf"
         ),
         .binaryTarget(
             name: "PACECloudWatchSDK",
-            url: "https://github.com/pace/cloud-sdk-ios/releases/download/25.1.0/PACECloudWatchSDK.zip",
-            checksum: "0c0328d5584610bf22572e88ada6820f4782ba8a8bd8e6cb36efba79c51d988f"
+            url: "https://github.com/pace/cloud-sdk-ios/releases/download/25.0.0/PACECloudWatchSDK.zip",
+            checksum: "08546d518b4fcd5318fe633387ac5f3f84a77237d6a3434fe1d0c459cf502f51"
         )
     ]
 )
diff --git a/UnitTestDummy/Info.plist b/UnitTestDummy/Info.plist
@@ -22,7 +22,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>25.1.0</string>
+	<string>25.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -27,14 +27,23 @@ platform :ios do
   lane :create_github_release do |options|
     new_sdk_version = options[:new_sdk_version]
 
+    asset_paths = ["../build/PACECloudSDK.zip", "../build/PACECloudSlimSDK.zip", "../build/PACECloudWatchSDK.zip"]
+    assets = []
+
+    for asset_path in asset_paths do
+      if File.exist?(asset_path)
+        assets.append(asset_path)
+      end
+    end
+
     set_github_release(
       repository_name: "pace/cloud-sdk-ios",
       api_token: ENV["GITHUB_API_TOKEN"],
       name: new_sdk_version,
       tag_name: new_sdk_version,
       description: (File.read("../build/release_notes_#{new_sdk_version}.md") rescue "No changelog provided"),
       commitish: "master",
-      upload_assets: ["./build/PACECloudSDK.zip", "./build/PACECloudSlimSDK.zip", "./build/PACECloudWatchSDK.zip"]
+      upload_assets: assets
     )
   end
 end
diff --git a/scripts/deploy_prod.sh b/scripts/deploy_prod.sh
@@ -4,6 +4,18 @@ SDK=$1
 SLIM_SDK=$2
 WATCH_SDK=$3
 
+if [ ! -e $SDK ]; then
+    echo "⚠️ PACECloudSDK.xcframework not found. Deployment will continue since this xcframework is not mandatory for a successful release."
+fi
+
+if [ ! -e $SLIM_SDK ]; then
+    echo "❌ PACECloudSlimSDK.xcframework not found but it's mandatory. Canceling deployment..."
+    exit 1
+elif [ ! -e $WATCH_SDK ]; then
+    echo "❌ PACECloudWatchSDK.xcframework not found but it's mandatory. Canceling deployment..."
+    exit 1
+fi
+
 echo 'Checking out master branch'
 git remote set-url origin "git@$CI_SERVER_HOST:$CI_PROJECT_PATH.git"
 git fetch --all --tags --force

Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@ let package = Package(`
`54`	`54`	`]),`
`55`	`55`	`.binaryTarget(`
`56`	`56`	`name: "PACECloudSlimSDK",`
`57`		`- url: "https://github.com/pace/cloud-sdk-ios/releases/download/25.1.0/PACECloudSlimSDK.zip",`
`58`		`- checksum: "a439082b91ad3a288561229d4d3d4a225873ebb59e31c33d6835ad3fa52095c2"`
	`57`	`+ url: "https://github.com/pace/cloud-sdk-ios/releases/download/25.0.0/PACECloudSlimSDK.zip",`
	`58`	`+ checksum: "5bf1d41cfaf21c65a86929a28c1f967d805a06e9a14c18a9cefe96219a9abecf"`
`59`	`59`	`),`
`60`	`60`	`.binaryTarget(`
`61`	`61`	`name: "PACECloudWatchSDK",`
`62`		`- url: "https://github.com/pace/cloud-sdk-ios/releases/download/25.1.0/PACECloudWatchSDK.zip",`
`63`		`- checksum: "0c0328d5584610bf22572e88ada6820f4782ba8a8bd8e6cb36efba79c51d988f"`
	`62`	`+ url: "https://github.com/pace/cloud-sdk-ios/releases/download/25.0.0/PACECloudWatchSDK.zip",`
	`63`	`+ checksum: "08546d518b4fcd5318fe633387ac5f3f84a77237d6a3434fe1d0c459cf502f51"`
`64`	`64`	`)`
`65`	`65`	`]`
`66`	`66`	`)`