Skip to content

Commit 6e87fdf

Browse files
committed
Remove Github action files
1 parent 986e648 commit 6e87fdf

File tree

5 files changed

+26
-65
lines changed

5 files changed

+26
-65
lines changed

.github/workflows/build_release.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

JoyKeyMapper.xcodeproj/project.pbxproj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,16 +613,19 @@
613613
CODE_SIGN_IDENTITY = "Apple Development";
614614
CODE_SIGN_STYLE = Automatic;
615615
COMBINE_HIDPI_IMAGES = YES;
616+
CURRENT_PROJECT_VERSION = 10;
616617
DEVELOPMENT_TEAM = EF37D6UQZ9;
618+
ENABLE_HARDENED_RUNTIME = YES;
617619
INFOPLIST_FILE = "$(SRCROOT)/JoyKeyMapper/Info.plist";
618620
LD_RUNPATH_SEARCH_PATHS = (
619621
"$(inherited)",
620622
"@executable_path/../Frameworks",
621623
);
622-
MARKETING_VERSION = 0.1;
624+
MARKETING_VERSION = 1.0;
623625
PRODUCT_BUNDLE_IDENTIFIER = jp.0spec.JoyKeyMapper;
624626
PRODUCT_NAME = "$(TARGET_NAME)";
625627
PROVISIONING_PROFILE_SPECIFIER = "";
628+
SKIP_INSTALL = NO;
626629
SWIFT_VERSION = 5.0;
627630
};
628631
name = Debug;
@@ -636,16 +639,19 @@
636639
CODE_SIGN_IDENTITY = "Apple Development";
637640
CODE_SIGN_STYLE = Automatic;
638641
COMBINE_HIDPI_IMAGES = YES;
642+
CURRENT_PROJECT_VERSION = 10;
639643
DEVELOPMENT_TEAM = EF37D6UQZ9;
644+
ENABLE_HARDENED_RUNTIME = YES;
640645
INFOPLIST_FILE = "$(SRCROOT)/JoyKeyMapper/Info.plist";
641646
LD_RUNPATH_SEARCH_PATHS = (
642647
"$(inherited)",
643648
"@executable_path/../Frameworks",
644649
);
645-
MARKETING_VERSION = 0.1;
650+
MARKETING_VERSION = 1.0;
646651
PRODUCT_BUNDLE_IDENTIFIER = jp.0spec.JoyKeyMapper;
647652
PRODUCT_NAME = "$(TARGET_NAME)";
648653
PROVISIONING_PROFILE_SPECIFIER = "";
654+
SKIP_INSTALL = NO;
649655
SWIFT_VERSION = 5.0;
650656
};
651657
name = Release;
@@ -671,6 +677,7 @@
671677
PRODUCT_BUNDLE_IDENTIFIER = jp.0spec.JoyKeyMapperLauncher;
672678
PRODUCT_NAME = "$(TARGET_NAME)";
673679
PROVISIONING_PROFILE_SPECIFIER = "";
680+
SKIP_INSTALL = YES;
674681
SWIFT_VERSION = 5.0;
675682
};
676683
name = Debug;
@@ -696,6 +703,7 @@
696703
PRODUCT_BUNDLE_IDENTIFIER = jp.0spec.JoyKeyMapperLauncher;
697704
PRODUCT_NAME = "$(TARGET_NAME)";
698705
PROVISIONING_PROFILE_SPECIFIER = "";
706+
SKIP_INSTALL = YES;
699707
SWIFT_VERSION = 5.0;
700708
};
701709
name = Release;

JoyKeyMapper/Info.plist

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>1</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>LSApplicationCategoryType</key>
24+
<string>public.app-category.utilities</string>
2325
<key>LSMinimumSystemVersion</key>
2426
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2527
<key>LSUIElement</key>

JoyKeyMapperLauncher/Info.plist

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@
2020
<string>1.0</string>
2121
<key>CFBundleVersion</key>
2222
<string>1</string>
23+
<key>LSApplicationCategoryType</key>
24+
<string>public.app-category.utilities</string>
2325
<key>LSMinimumSystemVersion</key>
2426
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
27+
<key>LSUIElement</key>
28+
<true/>
2529
<key>NSHumanReadableCopyright</key>
2630
<string>Copyright © 2020 DarkHorse. All rights reserved.</string>
2731
<key>NSMainStoryboardFile</key>
@@ -32,7 +36,5 @@
3236
<true/>
3337
<key>NSSupportsSuddenTermination</key>
3438
<true/>
35-
<key>LSUIElement</key>
36-
<true/>
3739
</dict>
3840
</plist>

scripts/build_dmg.sh

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -42,50 +42,30 @@ rm -rf "${TMP_DIR}"
4242
mkdir "${TMP_DIR}"
4343
cp -Rp "${SRC_APP_PATH}" "${APP_PATH}"
4444

45-
# Codesign
46-
echo "Codesigning..."
47-
codesign -f -o runtime --timestamp -s "Developer ID Application" "${APP_PATH}/Contents/Library/LoginItems/JoyKeyMapperLauncher.app" --entitlements "${LAUNCHER_ENTITLEMENTS}"
48-
if [ $? -ne 0 ]; then
49-
echo "error: Failed to sign to the helper app"
50-
exit 1
51-
fi
52-
53-
codesign -f -o runtime --timestamp -s "Developer ID Application" "${APP_PATH}/Contents/Frameworks/JoyConSwift.framework" --entitlements "${APP_ENTITLEMENTS}"
54-
if [ $? -ne 0 ]; then
55-
echo "error: Failed to sign to the framework"
56-
exit 2
57-
fi
58-
59-
codesign -f -o runtime --timestamp -s "Developer ID Application" "${APP_PATH}" --entitlements "${APP_ENTITLEMENTS}"
60-
if [ $? -ne 0 ]; then
61-
echo "error: Failed to sign to the app"
62-
exit 3
63-
fi
64-
6545
# Verify
6646
echo "Verifying..."
6747
codesign -dv --verbose=4 "${APP_PATH}"
6848
if [ $? -ne 0 ]; then
6949
echo "error: The app is not correctly signed"
70-
exit 4
50+
exit 3
7151
fi
7252

7353
# Create a dmg file
7454
echo "Creating a dmg file at ${DMG_PATH}"
7555
dmgbuild -s "${PROJECT_ROOT}/scripts/dmg_settings.py" JoyKeyMapper "${DMG_PATH}"
7656
if [ $? -ne 0 ]; then
7757
echo "error: Failed to build a dmg file"
78-
exit 5
58+
exit 4
7959
fi
8060

8161
echo "Code signing to the dmg file..."
8262
codesign -f -o runtime --timestamp -s "Developer ID Application" "${DMG_PATH}"
8363
if [ $? -ne 0 ]; then
8464
echo "error: Failed to sign to the dmg file"
85-
exit 6
65+
exit 5
8666
fi
8767

88-
# Notarize
68+
# Notarize the dmg file
8969
echo "Notarizing the dmg file..."
9070
RESULT=`xcrun altool --notarize-app \
9171
--primary-bundle-id "${BUNDLE_ID}" \
@@ -98,7 +78,7 @@ echo "${RESULT}"
9878
REQUEST_UUID=`echo "${RESULT}" | grep "RequestUUID = " | sed "s/RequestUUID = \(.*\)$/\1/"`
9979
if [ "${REQUEST_UUID}" == "" ]; then
10080
echo "error: Failed to notarize the dmg file"
101-
exit 7
81+
exit 6
10282
fi
10383

10484
echo "Waiting for the approval..."
@@ -123,21 +103,21 @@ for i in `seq ${RETRY}`; do
123103
else
124104
echo "${RESULT}"
125105
echo "error: Invalid notarization status: ${STATUS}"
126-
exit 8
106+
exit 7
127107
fi
128108
done
129109

130110
echo "${RESULT}"
131111
if [ ${APPROVED} = false ] ; then
132112
echo "error: Approval timeout"
133-
exit 9
113+
exit 8
134114
fi
135115

136116
# Staple a ticket to the dmg file
137117
xcrun stapler staple "${DMG_PATH}"
138118
if [ $? -ne 0 ]; then
139119
echo "error: Failed to staple a ticket"
140-
exit 10
120+
exit 9
141121
fi
142122

143-
echo "Done.\n"
123+
echo "Done."

0 commit comments

Comments
 (0)