From 89271157648358e65d46719cf40603426561da0b Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 06:41:33 -0600 Subject: [PATCH 01/77] should be able to reorder playlist tracks now --- components/Playlist/component.tsx | 42 +++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/components/Playlist/component.tsx b/components/Playlist/component.tsx index e5260ef4..5e0bcb88 100644 --- a/components/Playlist/component.tsx +++ b/components/Playlist/component.tsx @@ -1,13 +1,16 @@ import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models"; import { NativeStackNavigationProp } from "@react-navigation/native-stack"; import { StackParamList } from "../types"; -import { XStack, YStack } from "tamagui"; +import { getTokens, XStack, YStack } from "tamagui"; import { useItemTracks } from "../../api/queries/tracks"; import { RunTimeTicks } from "../Global/helpers/time-codes"; import { H4, H5, Text } from "../Global/helpers/text"; import Track from "../Global/components/track"; -import { FlatList } from "react-native"; import BlurhashedImage from "../Global/components/blurhashed-image"; +import DraggableFlatList from "react-native-draggable-flatlist"; +import { reorderPlaylist } from "@/api/mutations/functions/playlists"; +import { useState } from "react"; +import Icon from "../Global/helpers/icon"; interface PlaylistProps { playlist: BaseItemDto; @@ -19,13 +22,32 @@ export default function Playlist({ navigation }: PlaylistProps): React.JSX.Element { + const [editing, setEditing] = useState(false); const { data: tracks, isLoading } = useItemTracks(playlist.Id!); + navigation.setOptions({ + headerRight: () => { + return ( + setEditing(!editing)} + /> + ) + } + }) + return ( - ( + data={tracks ?? []} + keyExtractor={({ Id }, index) => { + return `${index}-${Id}` + }} + ListHeaderComponent={( )} numColumns={1} - renderItem={({ item: track, index }) => { + onDragEnd={({ data, from, to }) => { + reorderPlaylist(playlist.Id!, data[to].Id!, to) + }} + renderItem={({ item: track, getIndex, drag }) => { + + const index = getIndex(); return ( ) }} - ListFooterComponent={() => ( + ListFooterComponent={( Date: Mon, 3 Feb 2025 06:43:43 -0600 Subject: [PATCH 02/77] fix bulf --- components/Playlist/component.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Playlist/component.tsx b/components/Playlist/component.tsx index 5e0bcb88..0ea264c9 100644 --- a/components/Playlist/component.tsx +++ b/components/Playlist/component.tsx @@ -8,7 +8,7 @@ import { H4, H5, Text } from "../Global/helpers/text"; import Track from "../Global/components/track"; import BlurhashedImage from "../Global/components/blurhashed-image"; import DraggableFlatList from "react-native-draggable-flatlist"; -import { reorderPlaylist } from "@/api/mutations/functions/playlists"; +import { reorderPlaylist } from "../../api/mutations/functions/playlists"; import { useState } from "react"; import Icon from "../Global/helpers/icon"; From 23c305263b448550119fbf57a04f35adacfbbe79 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 06:52:38 -0600 Subject: [PATCH 03/77] Fix build add some downloads logic --- api/mutations/functions/playlists.ts | 2 +- api/queries/functions/downloads.ts | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/api/mutations/functions/playlists.ts b/api/mutations/functions/playlists.ts index af6159a1..24ac1270 100644 --- a/api/mutations/functions/playlists.ts +++ b/api/mutations/functions/playlists.ts @@ -1,4 +1,4 @@ -import Client from "@/api/client"; +import Client from "../../../api/client"; import { getPlaylistsApi } from "@jellyfin/sdk/lib/utils/api"; diff --git a/api/queries/functions/downloads.ts b/api/queries/functions/downloads.ts index 8239b225..0d81ec5b 100644 --- a/api/queries/functions/downloads.ts +++ b/api/queries/functions/downloads.ts @@ -1,11 +1,26 @@ +import { Dirs, FileSystem } from "react-native-file-access"; import Client from "../../../api/client"; import { getLibraryApi } from "@jellyfin/sdk/lib/utils/api"; export async function downloadTrack(itemId: string) : Promise { + + // Make sure downloads folder exists, create if it doesn't + if (!(await FileSystem.exists(`${Dirs.DocumentDir}/downloads`))) + await FileSystem.mkdir(`${Dirs.DocumentDir}/downloads`) + getLibraryApi(Client.api!) .getDownload({ itemId }, { 'responseType': 'blob' }) + .then(async (response) => { + if (response.status < 300) { + await FileSystem.writeFile("", response.data) + } + }) +} + +function getTrackFilePath(itemId: string) { + return `${Dirs.DocumentDir}/downloads/${itemId}` } \ No newline at end of file From 4a6ece62bf136cb532c2ddf2ac2a580e6b4fa7ec Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 06:57:22 -0600 Subject: [PATCH 04/77] that's so cool --- api/queries/functions/downloads.ts | 2 +- components/Playlist/component.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/queries/functions/downloads.ts b/api/queries/functions/downloads.ts index 0d81ec5b..d063c0c9 100644 --- a/api/queries/functions/downloads.ts +++ b/api/queries/functions/downloads.ts @@ -16,7 +16,7 @@ export async function downloadTrack(itemId: string) : Promise { }) .then(async (response) => { if (response.status < 300) { - await FileSystem.writeFile("", response.data) + await FileSystem.writeFile(getTrackFilePath(itemId), response.data) } }) } diff --git a/components/Playlist/component.tsx b/components/Playlist/component.tsx index 0ea264c9..fe7e2831 100644 --- a/components/Playlist/component.tsx +++ b/components/Playlist/component.tsx @@ -23,7 +23,7 @@ export default function Playlist({ }: PlaylistProps): React.JSX.Element { const [editing, setEditing] = useState(false); - const { data: tracks, isLoading } = useItemTracks(playlist.Id!); + const { data: tracks, isLoading, refetch } = useItemTracks(playlist.Id!); navigation.setOptions({ headerRight: () => { @@ -61,6 +61,7 @@ export default function Playlist({ numColumns={1} onDragEnd={({ data, from, to }) => { reorderPlaylist(playlist.Id!, data[to].Id!, to) + refetch(); }} renderItem={({ item: track, getIndex, drag }) => { From ca6aec30f6e5916d9060f8d7eb12a5b260c6db64 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 07:08:26 -0600 Subject: [PATCH 05/77] fix back navigation in draggableflatlist --- components/Player/screens/queue.tsx | 1 + components/Playlist/component.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/components/Player/screens/queue.tsx b/components/Player/screens/queue.tsx index b41e81a4..9db58b97 100644 --- a/components/Player/screens/queue.tsx +++ b/components/Player/screens/queue.tsx @@ -30,6 +30,7 @@ export default function Queue({ navigation }: { navigation: NativeStackNavigatio ( diff --git a/components/Playlist/component.tsx b/components/Playlist/component.tsx index fe7e2831..22d6cea9 100644 --- a/components/Playlist/component.tsx +++ b/components/Playlist/component.tsx @@ -44,6 +44,7 @@ export default function Playlist({ { return `${index}-${Id}` }} From 466ea9cc1a8f0d00c9c58defc04b85997664112a Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 07:33:48 -0600 Subject: [PATCH 06/77] Xcode stuff --- ios/Jellify.xcodeproj/project.pbxproj | 26 ++++++++++++++------------ ios/Jellify/Info.plist | 2 +- ios/JellifyTests/Info.plist | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index d0e90bcc..5f5d1c55 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -602,8 +602,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; - CURRENT_PROJECT_VERSION = 3; - DEVELOPMENT_TEAM = WAH9CZ8BPG; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 5; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; ENABLE_BITCODE = NO; INFOPLIST_FILE = Jellify/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.music"; @@ -621,6 +623,8 @@ "OTHER_SWIFT_FLAGS[arch=*]" = "DEBUG FB_SONARKIT_ENABLED"; PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -635,8 +639,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; - CURRENT_PROJECT_VERSION = 3; - DEVELOPMENT_TEAM = WAH9CZ8BPG; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 5; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; INFOPLIST_FILE = Jellify/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.music"; LD_RUNPATH_SEARCH_PATHS = ( @@ -652,6 +658,8 @@ OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -742,10 +750,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; @@ -830,10 +835,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; diff --git a/ios/Jellify/Info.plist b/ios/Jellify/Info.plist index 7fe2bbef..f9b32c4a 100644 --- a/ios/Jellify/Info.plist +++ b/ios/Jellify/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 3 + 5 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/JellifyTests/Info.plist b/ios/JellifyTests/Info.plist index ba7f37c6..11a3c578 100644 --- a/ios/JellifyTests/Info.plist +++ b/ios/JellifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 3 + 5 From 58e44c2d14fc236b09fd0224f84315647a59b543 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 07:42:20 -0600 Subject: [PATCH 07/77] update workflow --- .github/workflows/build-ios-app.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 80414a10..3b275159 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -14,6 +14,10 @@ jobs: node-version: 20 - run: npm run init - run: fastlane match + working-directory: ./ios + # env: + # MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + - run: fastlane beta env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} From 3ca11e38967c4b2cf43f34bdd312e10122614f78 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 07:47:17 -0600 Subject: [PATCH 08/77] update matchfile --- ios/fastlane/Matchfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Matchfile b/ios/fastlane/Matchfile index e852d8ed..5536f0de 100644 --- a/ios/fastlane/Matchfile +++ b/ios/fastlane/Matchfile @@ -1,4 +1,4 @@ -git_url("git@github.com:anultravioletaurora/jellify-signing.git") +git_url("https://github.com/anultravioletaurora/jellify-signing.git") storage_mode("git") From b5a01ea1092c30c7835c693fa8a8813d59df38bf Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 07:56:18 -0600 Subject: [PATCH 09/77] workflow stuff --- .github/workflows/build-ios-app.yml | 4 ++-- ios/fastlane/Matchfile | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 3b275159..cf351145 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -15,8 +15,8 @@ jobs: - run: npm run init - run: fastlane match working-directory: ./ios - # env: - # MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + env: + MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" - run: fastlane beta env: diff --git a/ios/fastlane/Matchfile b/ios/fastlane/Matchfile index 5536f0de..19e1c6eb 100644 --- a/ios/fastlane/Matchfile +++ b/ios/fastlane/Matchfile @@ -11,3 +11,5 @@ username("violet@cosmonautical.cloud") # Your Apple Developer Portal username # Remove the # in the beginning of the line to enable the other options # The docs are available on https://docs.fastlane.tools/actions/match + +git_basic_authorization(Base64.strict_encode64(ENV["SIGNING_REPO_PAT"])) \ No newline at end of file From 7c8008818a27f0c638ecb73148bb31f2ef2de3a0 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 07:59:52 -0600 Subject: [PATCH 10/77] fix nil --- ios/fastlane/Matchfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Matchfile b/ios/fastlane/Matchfile index 19e1c6eb..6bd20271 100644 --- a/ios/fastlane/Matchfile +++ b/ios/fastlane/Matchfile @@ -12,4 +12,4 @@ username("violet@cosmonautical.cloud") # Your Apple Developer Portal username # The docs are available on https://docs.fastlane.tools/actions/match -git_basic_authorization(Base64.strict_encode64(ENV["SIGNING_REPO_PAT"])) \ No newline at end of file +git_basic_authorization(Base64.strict_encode64(ENV["MATCH_REPO_PAT"])) \ No newline at end of file From 47a321b9c3324d271cd57ca245ed24eacf1e60d2 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 08:02:20 -0600 Subject: [PATCH 11/77] need this --- .github/workflows/build-ios-app.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index cf351145..d0adf16a 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -16,6 +16,7 @@ jobs: - run: fastlane match working-directory: ./ios env: + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" - run: fastlane beta From 6c4eadbc2f3e95f4ca2791abab30e6d8a58c13cd Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 08:05:43 -0600 Subject: [PATCH 12/77] add fastlane password --- .github/workflows/build-ios-app.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index d0adf16a..3fbbce6e 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -16,6 +16,7 @@ jobs: - run: fastlane match working-directory: ./ios env: + FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" From 87dd9d34f622c93d14df655de538eafd8e68204d Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 08:14:53 -0600 Subject: [PATCH 13/77] okay?? --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 3fbbce6e..b2cd108e 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -13,7 +13,7 @@ jobs: with: node-version: 20 - run: npm run init - - run: fastlane match + - run: fastlane match import working-directory: ./ios env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} From a96d2187bce5e4a4ce0e7b90037639484ce9c84e Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 08:19:11 -0600 Subject: [PATCH 14/77] maybe? --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index b2cd108e..a3d39638 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -13,7 +13,7 @@ jobs: with: node-version: 20 - run: npm run init - - run: fastlane match import + - run: fastlane match development --readonly working-directory: ./ios env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} From d68fb9c230f48b1408ecaaeba07ec24dc60163d1 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 09:51:51 -0600 Subject: [PATCH 15/77] Xcode signing --- ios/Jellify.xcodeproj/project.pbxproj | 4 ++-- ios/Jellify/Info.plist | 2 +- ios/JellifyTests/Info.plist | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 5f5d1c55..0a6b70a8 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -603,7 +603,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; ENABLE_BITCODE = NO; @@ -640,7 +640,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; INFOPLIST_FILE = Jellify/Info.plist; diff --git a/ios/Jellify/Info.plist b/ios/Jellify/Info.plist index f9b32c4a..d4549284 100644 --- a/ios/Jellify/Info.plist +++ b/ios/Jellify/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 5 + 7 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/JellifyTests/Info.plist b/ios/JellifyTests/Info.plist index 11a3c578..5566d295 100644 --- a/ios/JellifyTests/Info.plist +++ b/ios/JellifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 5 + 7 From 6b15b84f8ca71c019cc0d99cac6dd0502bbfdb97 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 10:05:28 -0600 Subject: [PATCH 16/77] fix playlist finish editing icon --- components/Playlist/component.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Playlist/component.tsx b/components/Playlist/component.tsx index 22d6cea9..403f8fb2 100644 --- a/components/Playlist/component.tsx +++ b/components/Playlist/component.tsx @@ -33,7 +33,7 @@ export default function Playlist({ ? getTokens().color.telemagenta.val : getTokens().color.white.val } - name={editing ? 'done' : 'pencil'} + name={editing ? 'check' : 'pencil'} onPress={() => setEditing(!editing)} /> ) From 3d079824830b5cb0e7b10ab56076800495b24f76 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 10:14:57 -0600 Subject: [PATCH 17/77] versioning stuff --- .github/workflows/build-ios-app.yml | 3 ++- ios/fastlane/Fastfile | 5 ++++- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index a3d39638..9dc03ce9 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -5,13 +5,14 @@ on: branches: - 'main' jobs: - build: + build-ios-beta: runs-on: macos-latest steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v4 with: node-version: 20 + - run: echo 'BUILD_NUMBER=$(node -p -e "require(./package.json).version")' >> $GITHUB_ENV - run: npm run init - run: fastlane match development --readonly working-directory: ./ios diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 6aee14a5..bed18327 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,7 +18,10 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" lane :beta do - increment_build_number(xcodeproj: "Jellify.xcodeproj") + increment_build_number( + version_number: ENV['BUILD_VERSION'], + xcodeproj: "Jellify.xcodeproj" + ) build_app(workspace: "Jellify.xcworkspace", scheme: "Jellify") upload_to_testflight end diff --git a/package.json b/package.json index 0e52226c..1923e96e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jellify", - "version": "0.1.5", + "version": "0.1.6", "private": true, "scripts": { "init": "npm i && npm run pod:install", From 9e0f2dc31d3cd5c4c617a678271df8ce216ef69d Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 10:15:49 -0600 Subject: [PATCH 18/77] versionning --- .github/workflows/build-ios-app.yml | 2 +- ios/fastlane/Fastfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 9dc03ce9..f792c8d8 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20 - - run: echo 'BUILD_NUMBER=$(node -p -e "require(./package.json).version")' >> $GITHUB_ENV + - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - run: fastlane match development --readonly working-directory: ./ios diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index bed18327..f77c028e 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -19,7 +19,7 @@ platform :ios do desc "Push a new beta build to TestFlight" lane :beta do increment_build_number( - version_number: ENV['BUILD_VERSION'], + version_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" ) build_app(workspace: "Jellify.xcworkspace", scheme: "Jellify") From cd268fa481cb7e9f0405e9f9bfa495c42161be06 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 10:18:37 -0600 Subject: [PATCH 19/77] fix pipeline --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index f77c028e..8896f700 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -19,7 +19,7 @@ platform :ios do desc "Push a new beta build to TestFlight" lane :beta do increment_build_number( - version_number: ENV['BUILD_NUMBER'], + build_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" ) build_app(workspace: "Jellify.xcworkspace", scheme: "Jellify") From d77a83544bfabdc7206e7a6a92ad7ae3adcfa481 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 11:06:47 -0600 Subject: [PATCH 20/77] fastfile stuff --- ios/fastlane/Fastfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 8896f700..3a8cef9b 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,10 +18,12 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" lane :beta do + setup_ci increment_build_number( build_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" ) + match(type: 'appstore') build_app(workspace: "Jellify.xcworkspace", scheme: "Jellify") upload_to_testflight end From 6016effdaa0bfa172d0451bec6c8bf8a97ad4bbb Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 11:09:16 -0600 Subject: [PATCH 21/77] idk --- ios/fastlane/Fastfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 3a8cef9b..9cb46b05 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -23,7 +23,6 @@ platform :ios do build_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" ) - match(type: 'appstore') build_app(workspace: "Jellify.xcworkspace", scheme: "Jellify") upload_to_testflight end From b64a28e2174058e0214edc88145d15ebeccf1b43 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 11:14:46 -0600 Subject: [PATCH 22/77] Xcode --- ios/Jellify.xcodeproj/project.pbxproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 0a6b70a8..74353fd7 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -602,6 +602,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = ""; @@ -639,6 +641,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = ""; @@ -659,7 +663,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.cosmonautical.jellify"; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; From 33ef80ac9af6602ae59ef9cfd4bda9492e63c9bf Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 11:18:50 -0600 Subject: [PATCH 23/77] update github workflow --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index f792c8d8..a30e59cc 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -14,7 +14,7 @@ jobs: node-version: 20 - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - - run: fastlane match development --readonly + - run: fastlane match import working-directory: ./ios env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} From e72bb31d9b78c868cc8e72df54cceb79b5146e10 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 11:21:00 -0600 Subject: [PATCH 24/77] workflow --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index a30e59cc..a73575c5 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -14,7 +14,7 @@ jobs: node-version: 20 - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - - run: fastlane match import + - run: fastlane match import --readonly working-directory: ./ios env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} From 68d48c5963cb08c6137b9169026f24a65edb902c Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 11:23:33 -0600 Subject: [PATCH 25/77] workflow --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index a73575c5..49300eae 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -14,7 +14,7 @@ jobs: node-version: 20 - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - - run: fastlane match import --readonly + - run: fastlane match --readonly working-directory: ./ios env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} From 3373c36095d4eeec0f10969ee02d399c681865e3 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 11:30:26 -0600 Subject: [PATCH 26/77] ci signing stuff --- .github/workflows/build-ios-app.yml | 4 +++- ios/fastlane/Fastfile | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 49300eae..81d31073 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -14,7 +14,7 @@ jobs: node-version: 20 - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - - run: fastlane match --readonly + - run: fastlane match development --readonly working-directory: ./ios env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} @@ -23,5 +23,7 @@ jobs: - run: fastlane beta env: + FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" working-directory: ./ios \ No newline at end of file diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 9cb46b05..3fd2d151 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -19,6 +19,7 @@ platform :ios do desc "Push a new beta build to TestFlight" lane :beta do setup_ci + match(type: "development", readonly: true) increment_build_number( build_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" From 5da0737e12c6ba059f428fb8e9257478f6efc2d1 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 11:49:30 -0600 Subject: [PATCH 27/77] xcode profiles --- ios/Jellify.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 74353fd7..2cd32688 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -642,7 +642,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = ""; @@ -663,7 +663,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.cosmonautical.jellify"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; From 027f3ce64d2d1d62afbfef289f5d74a2ed40b111 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 12:10:55 -0600 Subject: [PATCH 28/77] Xcode provisioning --- ios/Jellify.xcodeproj/project.pbxproj | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 2cd32688..99825464 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -602,11 +602,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 7; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; ENABLE_BITCODE = NO; INFOPLIST_FILE = Jellify/Info.plist; @@ -625,7 +625,7 @@ "OTHER_SWIFT_FLAGS[arch=*]" = "DEBUG FB_SONARKIT_ENABLED"; PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "match Development com.cosmonautical.jellify"; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -641,11 +641,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 7; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; INFOPLIST_FILE = Jellify/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.music"; @@ -662,7 +662,7 @@ OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "match Development com.cosmonautical.jellify"; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_VERSION = 5.0; From 7b8fee936b8c9329676f50375166f0d3252a9083 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 12:12:12 -0600 Subject: [PATCH 29/77] fastlane stuff --- ios/fastlane/Fastfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 3fd2d151..214eef09 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -19,7 +19,8 @@ platform :ios do desc "Push a new beta build to TestFlight" lane :beta do setup_ci - match(type: "development", readonly: true) + get_certificates + get_provisioning_profile increment_build_number( build_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" From 3b09a29edf9f6bb7481ded93b234bd6a49c79186 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 12:19:20 -0600 Subject: [PATCH 30/77] fastlane --- ios/fastlane/Fastfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 214eef09..697bb425 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -19,8 +19,10 @@ platform :ios do desc "Push a new beta build to TestFlight" lane :beta do setup_ci - get_certificates - get_provisioning_profile + sync_code_signing( + type: "adhoc", + readonly: true + ) increment_build_number( build_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" From 20f1a99f730ac96bc70c0c128b3c3a0fed15e948 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 12:19:39 -0600 Subject: [PATCH 31/77] fastlane match --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 81d31073..abc618de 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -14,7 +14,7 @@ jobs: node-version: 20 - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - - run: fastlane match development --readonly + - run: fastlane match adhoc --readonly working-directory: ./ios env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} From ee069c8a1c8185e24581a4d025eccfb66756f92e Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 12:24:29 -0600 Subject: [PATCH 32/77] Xcode signing --- ios/Jellify.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 99825464..65703221 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -625,8 +625,8 @@ "OTHER_SWIFT_FLAGS[arch=*]" = "DEBUG FB_SONARKIT_ENABLED"; PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; - PROVISIONING_PROFILE_SPECIFIER = "match Development com.cosmonautical.jellify"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ""; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -662,8 +662,8 @@ OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; - PROVISIONING_PROFILE_SPECIFIER = "match Development com.cosmonautical.jellify"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ""; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; From fbf23367d95222d4af30eb81e9b218dcbf185ec3 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 12:29:41 -0600 Subject: [PATCH 33/77] Xcode signing --- ios/Jellify.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 65703221..8d602771 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -602,8 +602,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; - CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = WAH9CZ8BPG; @@ -641,8 +641,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; - CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = WAH9CZ8BPG; From d482dfb1b2ae9659bf735f958fc9d0f993d22c95 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 12:39:04 -0600 Subject: [PATCH 34/77] Xcode manual signing --- ios/Jellify.xcodeproj/project.pbxproj | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 8d602771..c79c15f7 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -602,9 +602,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; @@ -625,8 +625,8 @@ "OTHER_SWIFT_FLAGS[arch=*]" = "DEBUG FB_SONARKIT_ENABLED"; PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ""; + PROVISIONING_PROFILE_SPECIFIER = "match Development com.cosmonautical.jellify"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -641,9 +641,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; @@ -662,8 +662,8 @@ OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ""; + PROVISIONING_PROFILE_SPECIFIER = "match Development com.cosmonautical.jellify"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; From 79b0a2d681c940eb17666c9f89b97d5529765d10 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 12:39:42 -0600 Subject: [PATCH 35/77] adjust pipeline --- .github/workflows/build-ios-app.yml | 1 - ios/fastlane/Fastfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index abc618de..fdf69086 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -14,7 +14,6 @@ jobs: node-version: 20 - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - - run: fastlane match adhoc --readonly working-directory: ./ios env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 697bb425..c8f5fc37 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -20,7 +20,7 @@ platform :ios do lane :beta do setup_ci sync_code_signing( - type: "adhoc", + type: "development", readonly: true ) increment_build_number( From 313bb97400f48c1f19e9ff1eba5e9eafbf7db12d Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 21:53:01 -0600 Subject: [PATCH 36/77] Xcode signing --- ios/Jellify.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index c79c15f7..33445961 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -641,8 +641,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Jellify/Jellify.entitlements; - CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = WAH9CZ8BPG; @@ -663,7 +663,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; PROVISIONING_PROFILE_SPECIFIER = "match Development com.cosmonautical.jellify"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.cosmonautical.jellify"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.cosmonautical.jellify"; SWIFT_OBJC_BRIDGING_HEADER = "Jellify-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; From 063a969d8f73af2ce655d0f8ec4784c41de9b1c9 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 21:54:06 -0600 Subject: [PATCH 37/77] workflow changes --- .github/workflows/build-ios-app.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index fdf69086..6cbbf3f4 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -14,12 +14,6 @@ jobs: node-version: 20 - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - working-directory: ./ios - env: - FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} - MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" - - run: fastlane beta env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} From 11df5eda6fc8378460090fcc83a75568cc5be1ec Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 21:57:16 -0600 Subject: [PATCH 38/77] fastfile changes --- ios/fastlane/Fastfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index c8f5fc37..e0256321 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -20,7 +20,8 @@ platform :ios do lane :beta do setup_ci sync_code_signing( - type: "development", + type: "appstore", + app_identifier: "com.cosmonautical.jellify" readonly: true ) increment_build_number( From d1531d98f208573794a552d65e06cbee65513ebf Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 22:00:05 -0600 Subject: [PATCH 39/77] fastfile fix --- ios/fastlane/Fastfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index e0256321..3595c486 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -19,9 +19,9 @@ platform :ios do desc "Push a new beta build to TestFlight" lane :beta do setup_ci - sync_code_signing( + match( type: "appstore", - app_identifier: "com.cosmonautical.jellify" + app_identifier: "com.cosmonautical.jellify", readonly: true ) increment_build_number( From c1cdc2aaab470f9097a4f1c034ba6c105266f290 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 22:16:33 -0600 Subject: [PATCH 40/77] update workflow to use fastlane apple app specific password --- .github/workflows/build-ios-app.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 6cbbf3f4..7a51b230 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -17,6 +17,7 @@ jobs: - run: fastlane beta env: FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} + FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" working-directory: ./ios \ No newline at end of file From 5c456694540d8306d5647b6c414d8cf1539ca9b4 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 22:32:33 -0600 Subject: [PATCH 41/77] leggooo --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 7a51b230..d9f311ca 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -16,7 +16,7 @@ jobs: - run: npm run init - run: fastlane beta env: - FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} + # FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" From c511d54fe1d0398d0cb728cc472f3eac9a95034b Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 22:50:20 -0600 Subject: [PATCH 42/77] fastfile app password support --- ios/fastlane/Fastfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 3595c486..0fd6c24c 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -28,7 +28,14 @@ platform :ios do build_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" ) - build_app(workspace: "Jellify.xcworkspace", scheme: "Jellify") - upload_to_testflight + build_app( + scheme: "Jellify", + workspace: "Jellify.xcworkspace", + include_bitcode: true + ) + # http://docs.fastlane.tools/actions/upload_to_testflight/#upload_to_testflight + upload_to_testflight( + skip_waiting_for_build_processing: true # Required for App password support + ) end end From 0d387bdcb241c8069480230befac5c0c1724a8c3 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 23:00:41 -0600 Subject: [PATCH 43/77] Fix gesture handler --- App.tsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/App.tsx b/App.tsx index fe4dd2d7..00e76884 100644 --- a/App.tsx +++ b/App.tsx @@ -8,6 +8,7 @@ import { useColorScheme } from 'react-native'; import jellifyConfig from './tamagui.config'; import { clientPersister } from './constants/storage'; import { queryClient } from './constants/query-client'; +import { GestureHandlerRootView } from 'react-native-gesture-handler'; export default function App(): React.JSX.Element { @@ -19,11 +20,13 @@ export default function App(): React.JSX.Element { persistOptions={{ persister: clientPersister }}> - - - - - + + + + + + + ); } \ No newline at end of file From 3002e5ee69a9e1996ed3b3f3e7a100ba05e2b3ce Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 23:02:37 -0600 Subject: [PATCH 44/77] fastlane stuff --- ios/fastlane/Fastfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 0fd6c24c..e733104a 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -31,7 +31,6 @@ platform :ios do build_app( scheme: "Jellify", workspace: "Jellify.xcworkspace", - include_bitcode: true ) # http://docs.fastlane.tools/actions/upload_to_testflight/#upload_to_testflight upload_to_testflight( From 7e71877f19b3dea9212f2a7f4b2b72202b30315f Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 23:09:38 -0600 Subject: [PATCH 45/77] make logos look better in item card --- components/Global/components/item-card.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Global/components/item-card.tsx b/components/Global/components/item-card.tsx index e2758796..dfeee0d3 100644 --- a/components/Global/components/item-card.tsx +++ b/components/Global/components/item-card.tsx @@ -18,7 +18,7 @@ export function ItemCard(props: CardProps) { const dimensions = props.width && typeof(props.width) === "number" ? { width: props.width, height: props.width } : { width: 150, height: 150 }; - const logoDimensions = props.width && typeof(props.width) === "number" ? { width: props.width / 2, height: props.width / 3 }: { width: 100, height: 30 }; + const logoDimensions = props.width && typeof(props.width) === "number" ? { width: props.width / 2, height: props.width / 5 }: { width: 100, height: 30 }; return ( Date: Mon, 3 Feb 2025 23:12:09 -0600 Subject: [PATCH 46/77] Updating schemes --- ios/Jellify.xcodeproj/project.pbxproj | 1 - ios/Jellify.xcodeproj/xcshareddata/xcschemes/Jellify.xcscheme | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 33445961..cb102a4a 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -622,7 +622,6 @@ "-lc++", ); OTHER_SWIFT_FLAGS = "$(inherited)"; - "OTHER_SWIFT_FLAGS[arch=*]" = "DEBUG FB_SONARKIT_ENABLED"; PRODUCT_BUNDLE_IDENTIFIER = com.cosmonautical.jellify; PRODUCT_NAME = Jellify; PROVISIONING_PROFILE_SPECIFIER = "match Development com.cosmonautical.jellify"; diff --git a/ios/Jellify.xcodeproj/xcshareddata/xcschemes/Jellify.xcscheme b/ios/Jellify.xcodeproj/xcshareddata/xcschemes/Jellify.xcscheme index b2bfedf5..26eed832 100644 --- a/ios/Jellify.xcodeproj/xcshareddata/xcschemes/Jellify.xcscheme +++ b/ios/Jellify.xcodeproj/xcshareddata/xcschemes/Jellify.xcscheme @@ -41,7 +41,7 @@ Date: Mon, 3 Feb 2025 23:12:55 -0600 Subject: [PATCH 47/77] add build fastlane --- ios/fastlane/Fastfile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index e733104a..95b2095b 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -17,6 +17,19 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" + + lane :build do + match( + type: "development", + app_identifier: "com.cosmonautical.jellify", + readonly: true + ) + build_app( + scheme: "Jellify" + workspace: "Jellify.xcworkspace" + ) + end + lane :beta do setup_ci match( @@ -29,7 +42,7 @@ platform :ios do xcodeproj: "Jellify.xcodeproj" ) build_app( - scheme: "Jellify", + scheme: "Jellify - Release", workspace: "Jellify.xcworkspace", ) # http://docs.fastlane.tools/actions/upload_to_testflight/#upload_to_testflight From 2b5be133e1e7f533831d43b8ef677c20def5399a Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 23:14:37 -0600 Subject: [PATCH 48/77] plz logos --- components/Global/components/item-card.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Global/components/item-card.tsx b/components/Global/components/item-card.tsx index dfeee0d3..8f81d915 100644 --- a/components/Global/components/item-card.tsx +++ b/components/Global/components/item-card.tsx @@ -18,7 +18,7 @@ export function ItemCard(props: CardProps) { const dimensions = props.width && typeof(props.width) === "number" ? { width: props.width, height: props.width } : { width: 150, height: 150 }; - const logoDimensions = props.width && typeof(props.width) === "number" ? { width: props.width / 2, height: props.width / 5 }: { width: 100, height: 30 }; + const logoDimensions = props.width && typeof(props.width) === "number" ? { width: props.width / 2, height: props.width / 6 }: { width: 100, height: 30 }; return ( Date: Mon, 3 Feb 2025 23:36:33 -0600 Subject: [PATCH 49/77] try api key for appstore connect --- .github/workflows/build-ios-app.yml | 12 ++++++++++-- ios/fastlane/Fastfile | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index d9f311ca..b3238e8b 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -9,15 +9,23 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 + - uses: actions/setup-node@v4 with: node-version: 20 + - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV + - run: npm run init + + - run: echo ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} > appstore_connect_api_key.json + working-directory: ./ios/fastlane + - run: fastlane beta + working-directory: ./ios env: # FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} + APPSTORE_CONNECT_API_KEY_JSON: ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" - working-directory: ./ios \ No newline at end of file + MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" \ No newline at end of file diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 95b2095b..fb3b0dad 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -25,7 +25,7 @@ platform :ios do readonly: true ) build_app( - scheme: "Jellify" + scheme: "Jellify", workspace: "Jellify.xcworkspace" ) end @@ -47,7 +47,7 @@ platform :ios do ) # http://docs.fastlane.tools/actions/upload_to_testflight/#upload_to_testflight upload_to_testflight( - skip_waiting_for_build_processing: true # Required for App password support + api_key_path: "./appstore_connect_api_key.json" ) end end From d5e6241d51a186cf7c684edbe1b62f401227f30b Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 23:40:06 -0600 Subject: [PATCH 50/77] work --- .github/workflows/build-ios-app.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index b3238e8b..1345d88c 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -18,7 +18,8 @@ jobs: - run: npm run init - - run: echo ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} > appstore_connect_api_key.json + - name: Output App Store Connect API Key JSON to Fastlane + run: echo `${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}` > appstore_connect_api_key.json working-directory: ./ios/fastlane - run: fastlane beta From ad4e52850a3d3520f25984037a83400302e4ef78 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 23:41:20 -0600 Subject: [PATCH 51/77] workflow stuff --- .github/workflows/build-ios-app.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 1345d88c..8a3ff0e0 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -8,13 +8,14 @@ jobs: build-ios-beta: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: node-version: 20 - - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV + - name: Echo package.json version to Github ENV + run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init From 29ca5cc4d5dd3ee0e66c196fd28569d03c3b759d Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 23:42:29 -0600 Subject: [PATCH 52/77] bruh --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 8a3ff0e0..7b44088c 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -20,7 +20,7 @@ jobs: - run: npm run init - name: Output App Store Connect API Key JSON to Fastlane - run: echo `${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}` > appstore_connect_api_key.json + run: echo "${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}" > appstore_connect_api_key.json working-directory: ./ios/fastlane - run: fastlane beta From ba466c512b9835bdcd5a31080d3cc03b3b060660 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Mon, 3 Feb 2025 23:53:25 -0600 Subject: [PATCH 53/77] idk dawg --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index fb3b0dad..9a49d5b4 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -47,7 +47,7 @@ platform :ios do ) # http://docs.fastlane.tools/actions/upload_to_testflight/#upload_to_testflight upload_to_testflight( - api_key_path: "./appstore_connect_api_key.json" + api_key_path: "appstore_connect_api_key.json" ) end end From 08d85aed59ce717290533cdefb3c0415e04a09f6 Mon Sep 17 00:00:00 2001 From: Violet Caulfield <42452695+anultravioletaurora@users.noreply.github.com> Date: Tue, 4 Feb 2025 00:03:49 -0600 Subject: [PATCH 54/77] what about here? --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 9a49d5b4..98a5271a 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -47,7 +47,7 @@ platform :ios do ) # http://docs.fastlane.tools/actions/upload_to_testflight/#upload_to_testflight upload_to_testflight( - api_key_path: "appstore_connect_api_key.json" + api_key_path: "fastlane/appstore_connect_api_key.json" ) end end From a2eb616d949c9212399df982de6084351b7c0732 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 06:22:50 -0600 Subject: [PATCH 55/77] Add Jellify Release scheme --- .../xcschemes/Jellify - Release.xcscheme | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 ios/Jellify.xcodeproj/xcshareddata/xcschemes/Jellify - Release.xcscheme diff --git a/ios/Jellify.xcodeproj/xcshareddata/xcschemes/Jellify - Release.xcscheme b/ios/Jellify.xcodeproj/xcshareddata/xcschemes/Jellify - Release.xcscheme new file mode 100644 index 00000000..465c1d19 --- /dev/null +++ b/ios/Jellify.xcodeproj/xcshareddata/xcschemes/Jellify - Release.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fdc2628fb39e92d728cdf41056172cd0029fdbf9 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 06:23:15 -0600 Subject: [PATCH 56/77] debug workflow --- .github/workflows/build-ios-app.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 7b44088c..f70ebe16 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -23,6 +23,9 @@ jobs: run: echo "${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}" > appstore_connect_api_key.json working-directory: ./ios/fastlane + - run: cat appstore_connect_api_key.json + working-directory: ./ios/fastlane + - run: fastlane beta working-directory: ./ios env: From e33653fa33871f2b6ce1a3ba30e61a58c6f77c97 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 08:45:13 -0600 Subject: [PATCH 57/77] fix error on track change when player is open --- components/Player/screens/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/Player/screens/index.tsx b/components/Player/screens/index.tsx index cd59498f..c5dc735e 100644 --- a/components/Player/screens/index.tsx +++ b/components/Player/screens/index.tsx @@ -31,7 +31,7 @@ export default function PlayerScreen({ navigation }: { navigation: NativeStackNa } = usePlayerContext(); const [seeking, setSeeking] = useState(false); - const [progressState, setProgressState] = useState(progress!.position); + const [progressState, setProgressState] = useState(progress?.position ?? 0); const { width } = useSafeAreaFrame(); @@ -45,7 +45,7 @@ export default function PlayerScreen({ navigation }: { navigation: NativeStackNa useEffect(() => { if (!seeking) - setProgressState(Math.round(progress!.position)) + setProgressState(Math.round(progress?.position ?? 0)) }, [ progress ]); From 90a421753dcbadaff8d617373bae91cd650d62ac Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 08:48:13 -0600 Subject: [PATCH 58/77] player fixes --- components/Player/screens/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/Player/screens/index.tsx b/components/Player/screens/index.tsx index c5dc735e..1738a769 100644 --- a/components/Player/screens/index.tsx +++ b/components/Player/screens/index.tsx @@ -147,7 +147,7 @@ export default function PlayerScreen({ navigation }: { navigation: NativeStackNa {/* playback progress goes here */} - {progress!.duration} + {progress?.duration ?? 0} From 2d8cb6d4776be1565e021ac9f3523daeb077e4b3 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 08:56:40 -0600 Subject: [PATCH 59/77] maybe this can't be the same as zero? --- components/Player/screens/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Player/screens/index.tsx b/components/Player/screens/index.tsx index 1738a769..be6feaf8 100644 --- a/components/Player/screens/index.tsx +++ b/components/Player/screens/index.tsx @@ -147,7 +147,7 @@ export default function PlayerScreen({ navigation }: { navigation: NativeStackNa {/* playback progress goes here */} Date: Tue, 4 Feb 2025 08:58:58 -0600 Subject: [PATCH 60/77] update workflow --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index f70ebe16..700a714c 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -20,7 +20,7 @@ jobs: - run: npm run init - name: Output App Store Connect API Key JSON to Fastlane - run: echo "${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}" > appstore_connect_api_key.json + run: echo `${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}` > appstore_connect_api_key.json working-directory: ./ios/fastlane - run: cat appstore_connect_api_key.json From 9e16cbf6db40bef905dc0a04dd498c351d4d1ee2 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 09:11:28 -0600 Subject: [PATCH 61/77] workflow connect api key dubugging --- .github/workflows/build-ios-app.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 700a714c..e05df51f 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -20,7 +20,9 @@ jobs: - run: npm run init - name: Output App Store Connect API Key JSON to Fastlane - run: echo `${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}` > appstore_connect_api_key.json + run: cat <<'EOF' + echo ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} > appstore_connect_api_key.json + EOF working-directory: ./ios/fastlane - run: cat appstore_connect_api_key.json From 0fc1cc3e98297de04a6a7cbf30eeaf6b94adff9f Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 09:14:53 -0600 Subject: [PATCH 62/77] what if? --- .github/workflows/build-ios-app.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index e05df51f..33b748f0 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -20,9 +20,7 @@ jobs: - run: npm run init - name: Output App Store Connect API Key JSON to Fastlane - run: cat <<'EOF' - echo ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} > appstore_connect_api_key.json - EOF + run: echo '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json working-directory: ./ios/fastlane - run: cat appstore_connect_api_key.json From 3da267f5d6146781674438fcfd777f9cd9831da4 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 09:53:48 -0600 Subject: [PATCH 63/77] update workflow --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 33b748f0..643d7e7a 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -20,7 +20,7 @@ jobs: - run: npm run init - name: Output App Store Connect API Key JSON to Fastlane - run: echo '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json + run: echo -e '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json working-directory: ./ios/fastlane - run: cat appstore_connect_api_key.json From 468aae20c472ba693acb6f6bf1567e5c6170cdf2 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 10:13:15 -0600 Subject: [PATCH 64/77] do versioning correctly --- .github/workflows/build-ios-app.yml | 5 +---- ios/fastlane/Fastfile | 7 ++++++- package.json | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 643d7e7a..472c423a 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -15,7 +15,7 @@ jobs: node-version: 20 - name: Echo package.json version to Github ENV - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV + run: echo VERISON_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init @@ -23,9 +23,6 @@ jobs: run: echo -e '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json working-directory: ./ios/fastlane - - run: cat appstore_connect_api_key.json - working-directory: ./ios/fastlane - - run: fastlane beta working-directory: ./ios env: diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 98a5271a..4274b707 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -37,8 +37,13 @@ platform :ios do app_identifier: "com.cosmonautical.jellify", readonly: true ) + + increment_version_number( + version_number: ENV['VERISON_NUMBER'], + xcodeproj: "Jellify.xcodeproj" + ) + increment_build_number( - build_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" ) build_app( diff --git a/package.json b/package.json index 1923e96e..50d236fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jellify", - "version": "0.1.6", + "version": "0.1.7", "private": true, "scripts": { "init": "npm i && npm run pod:install", From bdfbaf95a29d76bbb050cf032184a655d57c30b7 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 14:47:20 -0600 Subject: [PATCH 65/77] update workflows --- .github/workflows/build-ios.yml | 32 +++++++++++++++++++ ...build-ios-app.yml => publish-ios-beta.yml} | 0 2 files changed, 32 insertions(+) create mode 100644 .github/workflows/build-ios.yml rename .github/workflows/{build-ios-app.yml => publish-ios-beta.yml} (100%) diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml new file mode 100644 index 00000000..5b0296ae --- /dev/null +++ b/.github/workflows/build-ios.yml @@ -0,0 +1,32 @@ +name: build-ios +on: + push: + branches-ignore: + - "main" +jobs: + build-ios: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Echo package.json version to Github ENV + run: echo VERISON_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV + + - run: npm run init + + - name: Output App Store Connect API Key JSON to Fastlane + run: echo -e '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json + working-directory: ./ios/fastlane + + - run: fastlane build + working-directory: ./ios + env: + # FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} + APPSTORE_CONNECT_API_KEY_JSON: ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} + FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" \ No newline at end of file diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/publish-ios-beta.yml similarity index 100% rename from .github/workflows/build-ios-app.yml rename to .github/workflows/publish-ios-beta.yml From d11889d49b48b2b78ec15e3074c9641e5af2c5f4 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 14:54:54 -0600 Subject: [PATCH 66/77] adjust build workflow --- .github/workflows/build-ios.yml | 6 +----- ios/fastlane/Fastfile | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 5b0296ae..594b2305 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -17,11 +17,7 @@ jobs: run: echo VERISON_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - - - name: Output App Store Connect API Key JSON to Fastlane - run: echo -e '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json - working-directory: ./ios/fastlane - + - run: fastlane build working-directory: ./ios env: diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 4274b707..1ef7c509 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -20,7 +20,7 @@ platform :ios do lane :build do match( - type: "development", + type: "appstore", app_identifier: "com.cosmonautical.jellify", readonly: true ) From de56533725f70f411992744acc506dae249ee60f Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 15:02:19 -0600 Subject: [PATCH 67/77] Bump build number --- ios/Jellify.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index cb102a4a..c84ce3eb 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -605,7 +605,7 @@ CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; ENABLE_BITCODE = NO; @@ -643,7 +643,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; INFOPLIST_FILE = Jellify/Info.plist; From 68a68647853c97639601fab937a116b3fa1d58f5 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 15:02:51 -0600 Subject: [PATCH 68/77] add auto commit action to publish workflow since fastlane increments the build number --- .github/workflows/publish-ios-beta.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-ios-beta.yml b/.github/workflows/publish-ios-beta.yml index 472c423a..e76c43c4 100644 --- a/.github/workflows/publish-ios-beta.yml +++ b/.github/workflows/publish-ios-beta.yml @@ -26,8 +26,10 @@ jobs: - run: fastlane beta working-directory: ./ios env: - # FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} APPSTORE_CONNECT_API_KEY_JSON: ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" \ No newline at end of file + MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" + + # Commit Fastlane Xcode build number increment + - uses: stefanzweifel/git-auto-commit-action@v5 \ No newline at end of file From 3d45b7e976e1f8661c42f1c216562e54d950fd44 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 15:31:02 -0600 Subject: [PATCH 69/77] CI changes --- .github/workflows/publish-ios-beta.yml | 4 +++- ios/fastlane/Fastfile | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-ios-beta.yml b/.github/workflows/publish-ios-beta.yml index e76c43c4..82771efc 100644 --- a/.github/workflows/publish-ios-beta.yml +++ b/.github/workflows/publish-ios-beta.yml @@ -32,4 +32,6 @@ jobs: MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" # Commit Fastlane Xcode build number increment - - uses: stefanzweifel/git-auto-commit-action@v5 \ No newline at end of file + - uses: stefanzweifel/git-auto-commit-action@v5 + with: + token: ${{ secrets.SIGNING_REPO_PAT }} \ No newline at end of file diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 1ef7c509..f8bd1adf 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -19,6 +19,7 @@ platform :ios do desc "Push a new beta build to TestFlight" lane :build do + setup_ci match( type: "appstore", app_identifier: "com.cosmonautical.jellify", From ae0591f51e409da7740ce6212b798e4e73bf650f Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 15:31:53 -0600 Subject: [PATCH 70/77] bump build number --- ios/Jellify.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index c84ce3eb..71868a1d 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -605,7 +605,7 @@ CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; ENABLE_BITCODE = NO; @@ -643,7 +643,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; INFOPLIST_FILE = Jellify/Info.plist; From cf17e91c771a72e60898725b37e5cb7766deb654 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 16:02:20 -0600 Subject: [PATCH 71/77] bump build number --- ios/Jellify.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 71868a1d..ac26c91d 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -605,7 +605,7 @@ CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; ENABLE_BITCODE = NO; @@ -643,7 +643,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; INFOPLIST_FILE = Jellify/Info.plist; From eb3be62a9437790d9085613a43360a4c869e2ac3 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 16:02:42 -0600 Subject: [PATCH 72/77] update push pattern --- .github/workflows/publish-ios-beta.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-ios-beta.yml b/.github/workflows/publish-ios-beta.yml index 82771efc..2436fb4d 100644 --- a/.github/workflows/publish-ios-beta.yml +++ b/.github/workflows/publish-ios-beta.yml @@ -34,4 +34,5 @@ jobs: # Commit Fastlane Xcode build number increment - uses: stefanzweifel/git-auto-commit-action@v5 with: - token: ${{ secrets.SIGNING_REPO_PAT }} \ No newline at end of file + token: ${{ secrets.SIGNING_REPO_PAT }} + file_pattern: "ios/Jellify.xcodeproj/project.pbxproj" \ No newline at end of file From 7e20d27de8e85d2d1f0f596bfd7642b099748b76 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 16:26:38 -0600 Subject: [PATCH 73/77] okokok --- .github/workflows/publish-ios-beta.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-ios-beta.yml b/.github/workflows/publish-ios-beta.yml index 2436fb4d..95de01c6 100644 --- a/.github/workflows/publish-ios-beta.yml +++ b/.github/workflows/publish-ios-beta.yml @@ -9,6 +9,8 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v4 + with: + token: ${{ secrets.SIGNING_REPO_PAT }} - uses: actions/setup-node@v4 with: @@ -34,5 +36,4 @@ jobs: # Commit Fastlane Xcode build number increment - uses: stefanzweifel/git-auto-commit-action@v5 with: - token: ${{ secrets.SIGNING_REPO_PAT }} file_pattern: "ios/Jellify.xcodeproj/project.pbxproj" \ No newline at end of file From bffa9e9c559910334e8838631d077eef56606941 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 16:27:05 -0600 Subject: [PATCH 74/77] bump build number --- ios/Jellify.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index ac26c91d..e17a2ff0 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -605,7 +605,7 @@ CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 11; + CURRENT_PROJECT_VERSION = 12; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; ENABLE_BITCODE = NO; @@ -615,7 +615,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = "1.0 "; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -643,7 +643,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 11; + CURRENT_PROJECT_VERSION = 12; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; INFOPLIST_FILE = Jellify/Info.plist; @@ -652,7 +652,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = "1.0 "; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", From 87e829b1a85712269a07f3c6adf89af6d8e42d4a Mon Sep 17 00:00:00 2001 From: anultravioletaurora <42452695+anultravioletaurora@users.noreply.github.com> Date: Tue, 4 Feb 2025 22:38:23 +0000 Subject: [PATCH 75/77] Apply automatic changes --- ios/Jellify.xcodeproj/project.pbxproj | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index e17a2ff0..510ffc09 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -605,7 +605,7 @@ CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; ENABLE_BITCODE = NO; @@ -643,7 +643,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; INFOPLIST_FILE = Jellify/Info.plist; @@ -753,7 +753,10 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; @@ -838,7 +841,10 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; From 063c793818fe9f77563bb555a6b470c298d3dc15 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 16:39:36 -0600 Subject: [PATCH 76/77] skip recursive workflow calls --- .github/workflows/publish-ios-beta.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-ios-beta.yml b/.github/workflows/publish-ios-beta.yml index 95de01c6..3575c4e3 100644 --- a/.github/workflows/publish-ios-beta.yml +++ b/.github/workflows/publish-ios-beta.yml @@ -1,11 +1,11 @@ -name: build-ios-app +name: publish-ios-beta on: pull_request: push: branches: - 'main' jobs: - build-ios-beta: + publish-ios-beta: runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -36,4 +36,5 @@ jobs: # Commit Fastlane Xcode build number increment - uses: stefanzweifel/git-auto-commit-action@v5 with: + commit_message: "[skip actions]" file_pattern: "ios/Jellify.xcodeproj/project.pbxproj" \ No newline at end of file From e095e4f97a9dc26b2db51a51b393a97d058cd56c Mon Sep 17 00:00:00 2001 From: anultravioletaurora <42452695+anultravioletaurora@users.noreply.github.com> Date: Tue, 4 Feb 2025 22:50:44 +0000 Subject: [PATCH 77/77] [skip actions] --- ios/Jellify.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index 510ffc09..f382a524 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -605,7 +605,7 @@ CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 13; + CURRENT_PROJECT_VERSION = 14; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; ENABLE_BITCODE = NO; @@ -643,7 +643,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 13; + CURRENT_PROJECT_VERSION = 14; DEVELOPMENT_TEAM = WAH9CZ8BPG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG; INFOPLIST_FILE = Jellify/Info.plist;