Fix invisible strokes from Ink API timestamp bug

.github/workflows/preview.yml

@@ -1,78 +1,43 @@
-name: Build and Release Preview
+name: Build Preview
+
 on:
   push:
-    branches: ["dev"]
+    branches: ['main']
     paths:
       - 'app/**'
   workflow_dispatch:
 
-env:
-  MAVEN_OPTS: >-
-    -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: set up JDK 18
-        uses: actions/setup-java@v3
-        with:
-          java-version: "18"
-          distribution: "temurin"
-          # cache: gradle
+      - uses: actions/checkout@v4
 
-      - uses: gradle/gradle-build-action@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          gradle-version: 8.5
+          java-version: '17'
+          distribution: 'temurin'
 
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1.1
-        with:
-          fileDir: "./secrets"
-          fileName: "my.keystore"
-          encodedString: ${{ secrets.KEYSTORE_FILE }}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
-      - name: Remove `google-services.json`
-        run: rm ${{ github.workspace }}/app/google-services.json
+      - name: Build debug APK
+        run: ./gradlew -PIS_NEXT=true assembleDebug
 
-      - name: Decode and Replace `google-services.json`
-        env:
-          FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }}
+      - name: Rename APK
         run: |
-          echo $FIREBASE_CONFIG | base64 --decode > ${{ github.workspace }}/app/google-services.json
-          wc -l ${{ github.workspace }}/app/google-services.json
+          mv app/build/outputs/apk/debug/app-debug.apk \
+             app/build/outputs/apk/debug/notable-next.apk
 
-      - name: Execute Gradle build
-        run: |
-          export STORE_FILE="../${{ steps.decode_keystore.outputs.filePath }}"
-          export STORE_PASSWORD="${{ secrets.KEYSTORE_PASSWORD }}"
-          export KEY_ALIAS="${{ secrets.KEY_ALIAS }}"
-          export KEY_PASSWORD="${{ secrets.KEY_PASSWORD }}"
-          export SHIPBOOK_APP_ID="${{ secrets.SHIPBOOK_APP_ID }}"
-          export SHIPBOOK_APP_KEY="${{ secrets.SHIPBOOK_APP_KEY }}"
-
-          ./gradlew \
-            -PIS_NEXT=true \
-            assembleDebug
-
-      #   - name: Cache Gradle packages
-      #     uses: actions/cache@v1
-      #     with:
-      #         path: ~/.gradle/caches
-      #         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      #         restore-keys: ${{ runner.os }}-gradle
-
-      - run: mv ${{ github.workspace }}/app/build/outputs/apk/debug/app-debug.apk ${{ github.workspace }}/app/build/outputs/apk/debug/notable-next.apk
-
-      - name: Release
-        uses: softprops/action-gh-release@v1
+      - name: Update preview release
+        uses: softprops/action-gh-release@v2
         with:
-          files: ${{ github.workspace }}/app/build/outputs/apk/debug/notable-next.apk
+          files: app/build/outputs/apk/debug/notable-next.apk
           tag_name: next
           name: next
           prerelease: true
-          body: "Preview version built from branch: ${{ github.ref_name }}"
-          token: ${{ secrets.TOKEN }}
+          body: "Preview build from ${{ github.sha }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,91 +1,59 @@
-name: Build and Release Version
+name: Build and Release
 
 on:
+  push:
+    tags:
+      - 'v*'
   workflow_dispatch:
 
-env:
-  MAVEN_OPTS: >-
-    -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: set up JDK 18
-        uses: actions/setup-java@v3
-        with:
-          java-version: "18"
-          distribution: "temurin"
-          # cache: gradle
+      - uses: actions/checkout@v4
 
-      - uses: gradle/gradle-build-action@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          gradle-version: 8.5
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Decode Keystore
         id: decode_keystore
-        uses: timheuer/base64-to-file@v1.1
+        uses: timheuer/base64-to-file@v1.2
         with:
-          fileDir: "./secrets"
-          fileName: "my.keystore"
+          fileDir: './secrets'
+          fileName: 'notable-release.jks'
           encodedString: ${{ secrets.KEYSTORE_FILE }}
 
-      - name: Decode and Replace `google-services.json`
-        env:
-          FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }}
-        run: |
-          echo $FIREBASE_CONFIG | base64 --decode > ${{ github.workspace }}/app/google-services.json
-
-      - name: Execute Gradle build
-        env:
-          STORE_FILE: ${{ github.workspace }}/secrets/my.keystore
-          STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
-          KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
-          SHIPBOOK_APP_ID: ${{ secrets.SHIPBOOK_APP_ID }}
-          SHIPBOOK_APP_KEY: ${{ secrets.SHIPBOOK_APP_KEY }}
-        run: |
-          ./gradlew assembleRelease \
-            -PSTORE_FILE="$STORE_FILE" \
-            -PSTORE_PASSWORD="$STORE_PASSWORD" \
-            -PKEY_ALIAS="$KEY_ALIAS" \
-            -PKEY_PASSWORD="$KEY_PASSWORD"
-
-
-
-      #   - name: Cache Gradle packages
-      #     uses: actions/cache@v1
-      #     with:
-      #         path: ~/.gradle/caches
-      #         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      #         restore-keys: ${{ runner.os }}-gradle
-
-      - name: Verify APK Files
-        run: find ${{ github.workspace }}/app/build/outputs/apk/ -name "*.apk"
-
-      - name: Retrieve Version
+      - name: Build signed release APK
         env:
-          STORE_FILE: ${{ github.workspace }}/secrets/my.keystore
-          STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
-          KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
-          SHIPBOOK_APP_ID: ${{ secrets.SHIPBOOK_APP_ID }}
-          SHIPBOOK_APP_KEY: ${{ secrets.SHIPBOOK_APP_KEY }}
+          STORE_FILE: ${{ github.workspace }}/secrets/notable-release.jks
+          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        run: ./gradlew assembleRelease
+
+      - name: Get version name
+        id: version
         run: |
-          ./gradlew -q printVersionName
           VERSION_NAME=$(./gradlew -q printVersionName)
-          echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_ENV
-        id: android_version
-
+          echo "VERSION_NAME=$VERSION_NAME" >> "$GITHUB_OUTPUT"
 
       - name: Rename APK
-        run: mv ${{ github.workspace }}/app/build/outputs/apk/release/app-release.apk ${{ github.workspace }}/app/build/outputs/apk/release/notable-${{ env.VERSION_NAME }}.apk
+        run: |
+          mv app/build/outputs/apk/release/app-release.apk \
+             app/build/outputs/apk/release/notable-${{ steps.version.outputs.VERSION_NAME }}.apk
 
-      - name: Release
-        uses: softprops/action-gh-release@v1
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
         with:
-          files: ${{ github.workspace }}/app/build/outputs/apk/release/notable-${{ env.VERSION_NAME }}.apk
-          tag_name: v${{env.VERSION_NAME}}
-          token: ${{ secrets.TOKEN }}
+          files: app/build/outputs/apk/release/notable-${{ steps.version.outputs.VERSION_NAME }}.apk
+          tag_name: ${{ github.ref_name }}
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+*.jks