diff --git a/.github/workflows/android.publish.yml b/.github/workflows/android.publish.yml index beb5600fc..d1cd18230 100644 --- a/.github/workflows/android.publish.yml +++ b/.github/workflows/android.publish.yml @@ -1,4 +1,4 @@ -name: Publish @notesnook/mobile +name: Publish @notesnook/android on: workflow_dispatch diff --git a/.github/workflows/ios.publish.yml b/.github/workflows/ios.publish.yml index 617e1f0e5..23ce08cd2 100644 --- a/.github/workflows/ios.publish.yml +++ b/.github/workflows/ios.publish.yml @@ -19,6 +19,9 @@ jobs: npm ci --ignore-scripts --prefer-offline --no-audit npm run bootstrap -- --scope=mobile + - name: Build packages + run: npx nx run @notesnook/mobile:build + - name: Install Pods run: npm run prepare:ios @@ -31,22 +34,33 @@ jobs: export-options: apps/mobile/native/ios/ExportOptions.plist project-path: apps/mobile/native/ios/Notesnook.xcodeproj workspace-path: apps/mobile/native/ios/Notesnook.xcworkspace - update-targets: Notesnook, Make Note, NotesWidgetExtension + update-targets: | + Notesnook + Make Note + NotesWidgetExtension disable-targets: Notesnook-tvOS,Notesnook-tvOSTests,NotesnookTests code-signing-identity: Apple Distribution team-id: ${{ secrets.APPLE_TEAM_ID }} p12-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }} certificate-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }} app-store-connect-api-key-issuer-id: ${{ secrets.API_KEY_ISSUER_ID }} - app-store-connect-api-key-id: ${{ secrets.API_KEY_ID }} - app-store-connect-api-key: ${{ secrets.APPSTORE_CONNECT_API_KEY_BASE64 }} + app-store-connect-api-key-id: ${{ secrets.APPSTORE_KEY_ID }} + app-store-connect-api-key-base64: ${{ secrets.APPSTORE_CONNECT_API_KEY_BASE64 }} output-path: Notesnook.ipa mobileprovision-base64: | ${{ secrets.APPLE_MOBILE_PROVISION_APP }} ${{ secrets.APPLE_MOBILE_PROVISION_SHARE }} ${{ secrets.APPLE_MOBILE_PROVISION_WIDGET }} - - name: Upload Artifact + - name: 'Upload app to TestFlight' + uses: apple-actions/upload-testflight-build@v1 + with: + app-path: Notesnook.ipa + issuer-id: ${{ secrets.API_KEY_ISSUER_ID }} + api-key-id: ${{ secrets.API_KEY_ID }} + api-private-key: ${{ secrets.API_KEY }} + + - name: Upload to Github uses: actions/upload-artifact@v2 with: name: Notesnook.ipa diff --git a/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj b/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj index 582a7defb..af0c65177 100644 --- a/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj +++ b/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj @@ -14,13 +14,13 @@ 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 2DCD954D1E0B4F2C00145EB5 /* NotesnookTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* NotesnookTests.m */; }; - 6510626F27042891009661C3 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6552012F27019F7700A43C51 /* OpenSans-Regular.ttf */; }; - 6510627627042895009661C3 /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6552012E27019F6E00A43C51 /* OpenSans-SemiBold.ttf */; }; 6510E6D72877215700DACAA9 /* build.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6510E6D62877215700DACAA9 /* build.bundle */; }; 6515C42F2580AA3000E83E39 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6515C42E2580AA2F00E83E39 /* StoreKit.framework */; }; + 6517B7C12B6838EB0079FF37 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */; }; + 6517B7C22B6838EB0079FF37 /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */; }; + 6517B7C32B6838EB0079FF37 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */; }; 6529A13E279BC4C70048D4A8 /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6529A13D279BC4C70048D4A8 /* BootSplash.storyboard */; }; 6593E4A3281C345400492C50 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6593E4A2281C345400492C50 /* AppDelegate.mm */; }; - 659670B22A2754FD00C5D2AF /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 659670B12A2754FD00C5D2AF /* OpenSans-Bold.ttf */; }; 659BE46725E11A5100E05671 /* notesnook-text.png in Resources */ = {isa = PBXBuildFile; fileRef = 659BE46625E11A5100E05671 /* notesnook-text.png */; }; 65AA857925E6DDEC00772A01 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AA857825E6DDEC00772A01 /* WidgetKit.framework */; }; 65AA857B25E6DDEC00772A01 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AA857A25E6DDEC00772A01 /* SwiftUI.framework */; }; @@ -110,12 +110,12 @@ 4C4AF691C324D95337F2FB0A /* libPods-Make Note.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Make Note.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6510E6D62877215700DACAA9 /* build.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = build.bundle; path = "../../../../packages/editor-mobile/build.bundle"; sourceTree = ""; }; 6515C42E2580AA2F00E83E39 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; + 6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Regular.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-Regular.ttf"; sourceTree = ""; }; + 6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-SemiBold.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-SemiBold.ttf"; sourceTree = ""; }; + 6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Bold.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-Bold.ttf"; sourceTree = ""; }; 6529A13D279BC4C70048D4A8 /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = Notesnook/BootSplash.storyboard; sourceTree = ""; }; 6529D2B0257B4A2900B49BC3 /* NotesnookDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = NotesnookDebug.entitlements; path = Notesnook/NotesnookDebug.entitlements; sourceTree = ""; }; - 6552012E27019F6E00A43C51 /* OpenSans-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-SemiBold.ttf"; path = "../android/app/src/main/assets/fonts/OpenSans-SemiBold.ttf"; sourceTree = ""; }; - 6552012F27019F7700A43C51 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Regular.ttf"; path = "../android/app/src/main/assets/fonts/OpenSans-Regular.ttf"; sourceTree = ""; }; 6593E4A2281C345400492C50 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = Notesnook/AppDelegate.mm; sourceTree = ""; }; - 659670B12A2754FD00C5D2AF /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Bold.ttf"; path = "../android/app/src/main/assets/fonts/OpenSans-Bold.ttf"; sourceTree = ""; }; 659BE46625E11A5100E05671 /* notesnook-text.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "notesnook-text.png"; path = "Notesnook/Images.xcassets/notesnook-text.png"; sourceTree = ""; }; 65A7F34F255689AD00699170 /* Notesnook.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Notesnook.entitlements; path = Notesnook/Notesnook.entitlements; sourceTree = ""; }; 65AA857725E6DDEC00772A01 /* NotesWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotesWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -293,13 +293,13 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( + 6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */, + 6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */, + 6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */, 65C400DD2A80B68D00AA3DF5 /* MaterialCommunityIcons.ttf */, 65C149862A61151B005C40F1 /* extension.bundle */, 6510E6D62877215700DACAA9 /* build.bundle */, 65EC5B71272A7EE200FB3748 /* NotesWidgetExtensionDebug.entitlements */, - 6552012F27019F7700A43C51 /* OpenSans-Regular.ttf */, - 659670B12A2754FD00C5D2AF /* OpenSans-Bold.ttf */, - 6552012E27019F6E00A43C51 /* OpenSans-SemiBold.ttf */, 65D145C429DC30470056FE7D /* MaterialCommunityIcons.ttf */, 13B07FAE1A68108700A75B9A /* Notesnook */, 832341AE1AAA6A7D00B99B32 /* Libraries */, @@ -542,12 +542,12 @@ buildActionMask = 2147483647; files = ( 65C400DE2A80B68D00AA3DF5 /* MaterialCommunityIcons.ttf in Resources */, - 6510626F27042891009661C3 /* OpenSans-Regular.ttf in Resources */, - 659670B22A2754FD00C5D2AF /* OpenSans-Bold.ttf in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, + 6517B7C32B6838EB0079FF37 /* OpenSans-Bold.ttf in Resources */, + 6517B7C22B6838EB0079FF37 /* OpenSans-SemiBold.ttf in Resources */, 6529A13E279BC4C70048D4A8 /* BootSplash.storyboard in Resources */, 6510E6D72877215700DACAA9 /* build.bundle in Resources */, - 6510627627042895009661C3 /* OpenSans-SemiBold.ttf in Resources */, + 6517B7C12B6838EB0079FF37 /* OpenSans-Regular.ttf in Resources */, 659BE46725E11A5100E05671 /* notesnook-text.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 9a4c82d97..a482ebc92 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -10,6 +10,7 @@ "scripts": { "postinstall": "patch-package && node ./scripts/optimize-fonts.mjs", "run-android": "cd native && react-native run-android --active-arch-only", + "build": "echo 'No build script defined'", "run-ios": "cd native && react-native run-ios", "start": "cd native && react-native start", "repack": "cd native && react-native webpack-start", @@ -44,4 +45,4 @@ "react-native": "0.72.0", "react-native-iap": "12.11.0" } -} \ No newline at end of file +}