Release/0.2.0 rc (#8)

* Update update_package_swift.py to use textwrap module for trimming common whitespace so that multiline text does not need to start at column 0 in the script file.

* Fix whitespace in deliver.yml

* Update publish workflow to (hopefully) publish release when tag has been created

* Fix method for setting RELEASE_VERSION environment variables for later use

* Auto-updating Package.swift

.github/workflows/deliver.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Switch to Xcode 12.4
         run: sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
       - name: Assign Tag Number to RELEASE_VERSION environment variable
-        run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/*/*/}
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/*/}" >> $GITHUB_ENV
       - name: Build libtesseract
         run: task build-tesseract-xcframework-zip
       - name: Update Package.swift
@@ -31,8 +31,8 @@ jobs:
       - name: Create draft release
         uses: ncipollo/release-action@v1
         with:
-          artifact: "libtesseract-${{env.RELEASE_VERSION}}.xcframework.zip"
+          artifact: "libtesseract-${{ env.RELEASE_VERSION }}.xcframework.zip"
           draft: true
           allowUpdates: true
-          tag: ${{env.RELEASE_VERSION}}
+          tag: ${{ env.RELEASE_VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

@@ -11,7 +11,10 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Assign Tag Number to RELEASE_VERSION environment variable
-      run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/*/}
+      run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
     - name: Publish libtesseract
-      run: go run publish.go -version $RELEASE_VERSION -bintray-key ${{ secrets.BINTRAY_KEY }} -publish
-      working-directory: publish
+      uses: ncipollo/release-action@v1
+      with:
+        tag: ${{ env.RELEASE_VERSION }}
+        allowUpdates: true
+        token: ${{ secrets.GITHUB_TOKEN }}

Package.swift

@@ -14,8 +14,8 @@ let package = Package(
   targets: [
     .binaryTarget(
       name: "libtesseract",
-      url: "https://dl.bintray.com/steven0351/tesseract/libtesseract-0.1.0.xcframework.zip",
-      checksum: "f732c6e1bbdbbdec87201841a4654d4d22e055e960ec618d48f5ec8141331af7"
+      url: "https://github.com/SwiftyTesseract/libtesseract/releases/download/0.2.0-rc/libtesseract-0.2.0-rc.xcframework.zip",
+      checksum: "117f165a83b4149ab454a39decaa692de17f67aa200b858f16623e681bf637db"
     )
   ]
 )

update_package_swift.py

@@ -1,5 +1,6 @@
 import subprocess
 import argparse
+import textwrap
 
 def write_package_swift(version):
     libtesseract_zip = f"libtesseract-{version}.xcframework.zip"
@@ -8,29 +9,31 @@ def write_package_swift(version):
     checksum = checksum_result.stdout.decode("utf-8").strip("\n")
 
     with open("Package.swift", "w") as package_swift:
-        package_swift.write(f"""// swift-tools-version:5.3
+        package = f"""\
+        // swift-tools-version:5.3
 
-import PackageDescription
+        import PackageDescription
 
-let package = Package(
-  name: "libtesseract",
-  products: [
-    .library(
-      name: "libtesseract",
-      targets: ["libtesseract"]
-    ),
-  ],
-  dependencies: [],
-  targets: [
-    .binaryTarget(
-      name: "libtesseract",
-      url: "{download_url}",
-      checksum: "{checksum}"
-    )
-  ]
-)
+        let package = Package(
+          name: "libtesseract",
+          products: [
+            .library(
+              name: "libtesseract",
+              targets: ["libtesseract"]
+            ),
+          ],
+          dependencies: [],
+          targets: [
+            .binaryTarget(
+              name: "libtesseract",
+              url: "{download_url}",
+              checksum: "{checksum}"
+            )
+          ]
+        )
 
-""")
+        """
+        package_swift.write(textwrap.dedent(package))
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Update libtesseract Package.swift")