Skip to content

Commit 727eb2f

Browse files
tryboxxtryboxx
committed
Merge branch 'main' into develop
2 parents 8afc595 + a80b8bb commit 727eb2f

File tree

4 files changed

+57
-64
lines changed

4 files changed

+57
-64
lines changed

‎.github/workflows/deploy.yml

Lines changed: 34 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,38 @@
1-
name: deploy
1+
# name: deploy
22

3-
on:
4-
push:
5-
branches: [ main ]
6-
tags: [ v* ]
3+
# on:
4+
# push:
5+
# branches: [ main ]
6+
# pull_request:
7+
# branches: [ main ]
78

8-
jobs:
9-
deploy:
10-
runs-on: macos-latest
11-
env:
12-
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
9+
# workflow_dispatch:
1310

14-
steps:
15-
- name: Checkout project
16-
uses: actions/checkout@v2
11+
# jobs:
12+
# deploy:
13+
# name: Deploying to Testflight
14+
# runs-on: macOS-latest
15+
16+
# steps:
17+
# - name: Checkout repository
18+
# uses: actions/checkout@v1
1719

18-
- name: Set environment variables from project settings
19-
run: |
20-
exec .github/scripts/set-env-from-xcodeproj.sh
21-
- name: Import signing certificate
22-
env:
23-
SIGNING_CERTIFICATE_P12_DATA: ${{ secrets.SIGNING_CERTIFICATE_P12_DATA }}
24-
SIGNING_CERTIFICATE_PASSWORD: ${{ secrets.SIGNING_CERTIFICATE_PASSWORD }}
25-
run: |
26-
exec .github/scripts/import-certificate.sh
27-
- name: Import provisioning profile
28-
env:
29-
PROVISIONING_PROFILE_DATA: ${{ secrets.PROVISIONING_PROFILE_DATA }}
30-
run: |
31-
exec .github/scripts/import-profile.sh
32-
- name: Build app
33-
run: |
34-
fastlane run build_app
35-
- name: Upload build artifacts
36-
uses: actions/upload-artifact@v2
37-
with:
38-
name: build.log
39-
path: ~/Library/Logs/gym/*.log
40-
41-
- name: Upload release assets
42-
if: startsWith(github.ref, 'refs/tags/v')
43-
uses: softprops/action-gh-release@v1
44-
with:
45-
files: |
46-
${{ env.PRODUCT_NAME }}.ipa
47-
${{ env.PRODUCT_NAME }}.app.dSYM.zip
48-
env:
49-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50-
51-
- name: Upload app to App Store Connect
52-
if: startsWith(github.ref, 'refs/tags/v')
53-
env:
54-
APP_STORE_CONNECT_USERNAME: ${{ secrets.APP_STORE_CONNECT_USERNAME }}
55-
APP_STORE_CONNECT_PASSWORD: ${{ secrets.APP_STORE_CONNECT_PASSWORD }}
56-
run: |
57-
xcrun altool --upload-app -t ios -f "$PRODUCT_NAME.ipa" -u "$APP_STORE_CONNECT_USERNAME" -p "$APP_STORE_CONNECT_PASSWORD"
20+
# - name: Deploy iOS Beta to TestFlight via Fastlane
21+
# uses: maierj/[email protected]
22+
# with:
23+
# lane: closed_beta
24+
# env:
25+
# APP_STORE_CONNECT_TEAM_ID: '${{ secrets.APP_STORE_CONNECT_TEAM_ID }}'
26+
# DEVELOPER_APP_ID: '${{ secrets.DEVELOPER_APP_ID }}'
27+
# DEVELOPER_APP_IDENTIFIER: '${{ secrets.DEVELOPER_APP_IDENTIFIER }}'
28+
# DEVELOPER_PORTAL_TEAM_ID: '${{ secrets.DEVELOPER_PORTAL_TEAM_ID }}'
29+
# FASTLANE_APPLE_ID: '${{ secrets.FASTLANE_APPLE_ID }}'
30+
# FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: '${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}'
31+
# MATCH_PASSWORD: '${{ secrets.MATCH_PASSWORD }}'
32+
# GIT_AUTHORIZATION: '${{ secrets.GIT_AUTHORIZATION }}'
33+
# PROVISIONING_PROFILE_SPECIFIER: '${{ secrets.PROVISIONING_PROFILE_SPECIFIER }}'
34+
# TEMP_KEYCHAIN_PASSWORD: '${{ secrets.TEMP_KEYCHAIN_PASSWORD }}'
35+
# TEMP_KEYCHAIN_USER: '${{ secrets.TEMP_KEYCHAIN_USER }}'
36+
# APPLE_KEY_ID: '${{ secrets.APPLE_KEY_ID }}'
37+
# APPLE_ISSUER_ID: '${{ secrets.APPLE_ISSUER_ID }}'
38+
# APPLE_KEY_CONTENT: '${{ secrets.APPLE_KEY_CONTENT }}'

‎SECURITY.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 1.0.x | :white_check_mark: |
8+
9+
## Reports
10+
11+
For security issues, kindly email us at [email protected] instead of posting a public issue on GitHub.

‎SnippetsLibrary.xcodeproj/project.pbxproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
B8162F2226FB76F900FB0A9E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B88D4A3526F4E34900164BF5 /* GoogleService-Info.plist */; };
1011
B8190DF826FA388500E3994C /* SnippetType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8190DF726FA388500E3994C /* SnippetType.swift */; };
1112
B82561B426E81D570040A67E /* SnippetsLibraryApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82561B326E81D570040A67E /* SnippetsLibraryApp.swift */; };
1213
B82561B826E81D580040A67E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B82561B726E81D580040A67E /* Assets.xcassets */; };
@@ -871,10 +872,10 @@
871872
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
872873
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
873874
CODE_SIGN_ENTITLEMENTS = SnippetsLibrary/SnippetsLibrary.entitlements;
874-
CODE_SIGN_IDENTITY = "Mac Developer";
875-
CODE_SIGN_STYLE = Manual;
875+
CODE_SIGN_IDENTITY = "Apple Development";
876+
CODE_SIGN_STYLE = Automatic;
876877
COMBINE_HIDPI_IMAGES = YES;
877-
CURRENT_PROJECT_VERSION = 4;
878+
CURRENT_PROJECT_VERSION = 7;
878879
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
879880
DEVELOPMENT_ASSET_PATHS = "\"SnippetsLibrary/Preview Content\"";
880881
DEVELOPMENT_TEAM = 7WLUFJRJ56;
@@ -889,7 +890,7 @@
889890
MARKETING_VERSION = 1.0;
890891
PRODUCT_BUNDLE_IDENTIFIER = com.cphlowiec.SnippetsLibrary;
891892
PRODUCT_NAME = "$(TARGET_NAME)";
892-
PROVISIONING_PROFILE_SPECIFIER = "SnippetsLibrary Development";
893+
PROVISIONING_PROFILE_SPECIFIER = "";
893894
SWIFT_VERSION = 5.0;
894895
};
895896
name = Debug;
@@ -900,10 +901,10 @@
900901
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
901902
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
902903
CODE_SIGN_ENTITLEMENTS = SnippetsLibrary/SnippetsLibrary.entitlements;
903-
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
904-
CODE_SIGN_STYLE = Manual;
904+
CODE_SIGN_IDENTITY = "Apple Development";
905+
CODE_SIGN_STYLE = Automatic;
905906
COMBINE_HIDPI_IMAGES = YES;
906-
CURRENT_PROJECT_VERSION = 4;
907+
CURRENT_PROJECT_VERSION = 7;
907908
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
908909
DEVELOPMENT_ASSET_PATHS = "\"SnippetsLibrary/Preview Content\"";
909910
DEVELOPMENT_TEAM = 7WLUFJRJ56;
@@ -918,7 +919,7 @@
918919
MARKETING_VERSION = 1.0;
919920
PRODUCT_BUNDLE_IDENTIFIER = com.cphlowiec.SnippetsLibrary;
920921
PRODUCT_NAME = "$(TARGET_NAME)";
921-
PROVISIONING_PROFILE_SPECIFIER = "SnippetsLibrary Distribution";
922+
PROVISIONING_PROFILE_SPECIFIER = "";
922923
SWIFT_ACTIVE_COMPILATION_CONDITIONS = RELEASE;
923924
SWIFT_VERSION = 5.0;
924925
};

‎SnippetsLibrary.xcodeproj/xcshareddata/xcschemes/SnippetsLibrary.xcscheme

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
</Testables>
5252
</TestAction>
5353
<LaunchAction
54-
buildConfiguration = "Debug"
55-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
56-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
54+
buildConfiguration = "Release"
55+
selectedDebuggerIdentifier = ""
56+
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
5757
launchStyle = "0"
5858
useCustomWorkingDirectory = "NO"
5959
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)