docs and specs updates (#24)

cossacklabs · May 6, 2021 · 5898308 · 5898308
1 parent afd16d4
commit 5898308
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/RELEASING.md b/RELEASING.md
@@ -36,15 +36,16 @@ How to update to newer OpenSSL version, build, and publish a release.
 
 5. **Update SPM package settings**
 
-	 In the [`Package.swift`](Package.swift) file
-     update binary framework link with the upcoming version (semver format)
-     https://github.com/cossacklabs/openssl-apple/releases/download/1.1.10701/openssl-static-xcframework.zip
-
-     Also, update xcframework checksum.
- 
-     ```shell
-     swift package compute-checksum output/openssl-static-xcframework.zip
-     ```
+	 Update [`Package.swift`](Package.swift) file with the new URL of the binary framework and its checksum:
+
+   ```swift
+   .binaryTarget(name: "openssl",
+              // update version in URL path
+              url:"https://github.com/cossacklabs/openssl-apple/releases/download/1.1.10701/openssl-static-xcframework.zip",
+              // Run from package directory:
+              // swift package compute-checksum output/openssl-static-xcframework.zip
+              checksum: "77b9a36297a2cade7bb6db5282570740a2af7b1e5083f126f46ca2671b14d73e"),
+   ```
 
 6. **Commit, tag, push the release.**
 

diff --git a/carthage/README.md b/carthage/README.md
@@ -22,3 +22,5 @@ OpenSSL versions are translated to Carthage versions by renumbering like this:
 | 1.1.1g          | 1.1.107          |
 | 1.1.1h          | 1.1.10801        |
 | 1.1.1h          | 1.1.10802        | (no changes in OpenSSL, added arm64)
+| 1.1.1h          | 1.1.10803        | (no changes in OpenSSL, XCF support)
+| 1.1.1k          | 1.1.11101        | (XCF-only)
diff --git a/carthage/openssl-dynamic-xcframework.json b/carthage/openssl-dynamic-xcframework.json
@@ -1,4 +1,4 @@
 {
-    "1.1.11101": "https://github.com/cossacklabs/openssl-apple/releases/download/v1.1.11101/openssl-dynamic-xcframework.zip",
-    "1.1.10803": "https://github.com/cossacklabs/openssl-apple/releases/download/v1.1.10803/openssl-dynamic-xcframework.zip",
+    "1.1.11101": "https://github.com/cossacklabs/openssl-apple/releases/download/1.1.11101/openssl-dynamic-xcframework.zip",
+    "1.1.10803": "https://github.com/cossacklabs/openssl-apple/releases/download/1.1.10803/openssl-dynamic-xcframework.zip",
 }
diff --git a/carthage/openssl-static-xcframework.json b/carthage/openssl-static-xcframework.json
@@ -1,4 +1,4 @@
 {
-    "1.1.11101": "https://github.com/cossacklabs/openssl-apple/releases/download/v1.1.11101/openssl-static-xcframework.zip",
-    "1.1.10803": "https://github.com/cossacklabs/openssl-apple/releases/download/v1.1.10803/openssl-static-xcframework.zip",
+    "1.1.11101": "https://github.com/cossacklabs/openssl-apple/releases/download/1.1.11101/openssl-static-xcframework.zip",
+    "1.1.10803": "https://github.com/cossacklabs/openssl-apple/releases/download/1.1.10803/openssl-static-xcframework.zip",
 }
diff --git a/cocoapods/CLOpenSSL.podspec.template b/cocoapods/CLOpenSSL.podspec.template
@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
 
     # Source code location. Actually, this is the script that builds OpenSSL
     # after downloading its source tarball from the official site.
-    s.source  = { :git => "#{github_repo}.git", :tag => "v#{openssl_version}" }
+    s.source  = { :git => "#{github_repo}.git", :tag => "#{openssl_version}" }
     s.license = {
         :type => "OpenSSL/SSLeay",
         :text => <<~EOF

diff --git a/scripts/update-specs.sh b/scripts/update-specs.sh
@@ -51,7 +51,7 @@ do
     else
         (
             head -1 "$spec" 2> /dev/null || echo "{"
-            echo "    \"$version\": \"$GITHUB_REPO/releases/download/v$version/$package\","
+            echo "    \"$version\": \"$GITHUB_REPO/releases/download/$version/$package\","
             tail +2 "$spec" 2> /dev/null || echo "}"
         ) > "$OUTPUT/tmp.spec"
         mv "$OUTPUT/tmp.spec" "$spec"