Commit 4bd1849a authored by Gregor Longariva's avatar Gregor Longariva 💬
Browse files

Merge branch '19-mac-re-enrolling-after-uninstall-reinstall' into 'dev'

Resolve "Mac re-enrolling after uninstall & reinstall."

Closes #19

See merge request faumac/networkShareMounter!24
parents c19de68c 8d9afb09
......@@ -10,8 +10,6 @@
<dict>
<key>de.fau.rrze.NetworkShareMounter</key>
<string>Network Share Mounter</string>
<key>de.fau.rrze.NetworkShareMounter-LaunchAtLoginHelper</key>
<string>de.fau.rrze.NetworkShareMounter-LaunchAtLoginHelper</string>
</dict>
<key>signingCertificate</key>
<string>Developer ID Application</string>
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
......
# app_identifier("[[APP_IDENTIFIER]]") # The bundle identifier of your app
apple_id("rrze-apple-entwickler@fau.de") # Your Apple email address
team_id("C8F68RFW4L")
app_identifier("de.fau.rrze.NetworkShareMounter")
......
......@@ -52,6 +52,7 @@ lane :commonTasks do
desc "perform some commont build tasks"
id = getbundleid
tag = getlatestag
default_platform(:mac)
signing_id = ENV["SIGNING_ID"]
app_store_connect_api_key(
is_key_content_base64: true
......@@ -76,9 +77,12 @@ lane :commonTasks do
)
get_certificates
sync_code_signing
cert
sigh(force: true)
gym(
scheme: "networkShareMounter",
output_directory: "build/",
export_method: "developer-id",
export_options: "./ExportOptions.plist"
)
end
......@@ -107,7 +111,7 @@ lane :test do
signing_id = ENV["SIGNING_ID"]
output = sh("productbuild", "--sign", "#{signing_id}", "--component", "../build/Network\ Share\ Mounter.app", "/Applications", "../build/NetworkShareMounterTest-#{appversion}.pkg")
rescue => exception
on_error(exception)
#on_error(exception)
end
end
......
......@@ -6,6 +6,7 @@
# Remove the # in front of the line to enable the option
# scheme("Example")
scheme("Network Share Mounter")
# sdk("iphoneos9.0")
\ No newline at end of file
......@@ -2,8 +2,9 @@ git_url("https://gitlab.rrze.fau.de/faumac/fastlanecerts.git")
storage_mode("git")
app_identifier("de.fau.rrze.NetworkShareMounter")
type("development") # The default type, can be: appstore, adhoc, enterprise or development
type("developer_id") # The default type, can be: appstore, adhoc, enterprise or development
#additional_cert_types("mac_installer_distribution")
platform("macos")
# app_identifier(["tools.fastlane.app", "tools.fastlane.app2"])
username("rrze-apple-entwickler@fau.de") # Your Apple Developer Portal username
......
......@@ -265,8 +265,6 @@
};
F79B15AE274E722100C322A8 = {
CreatedOnToolsVersion = 13.2;
DevelopmentTeam = C8F68RFW4L;
ProvisioningStyle = Manual;
TestTargetID = F79B1594274E722000C322A8;
};
};
......@@ -589,10 +587,10 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = "Network Share Mounter/Network_Share_Mounter.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = C8F68RFW4L;
ENABLE_HARDENED_RUNTIME = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
......@@ -607,12 +605,12 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 2.0.4;
MARKETING_VERSION = 2.1.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = de.fau.rrze.NetworkShareMounter;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE_SPECIFIER = "Network Share Mounter";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
......@@ -633,10 +631,10 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = "Network Share Mounter/Network_Share_Mounter.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = C8F68RFW4L;
ENABLE_HARDENED_RUNTIME = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
......@@ -651,11 +649,11 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 2.0.4;
MARKETING_VERSION = 2.1.0;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = de.fau.rrze.NetworkShareMounter;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE_SPECIFIER = "Network Share Mounter";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
};
......@@ -674,7 +672,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = C8F68RFW4L;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
......@@ -705,7 +703,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = C8F68RFW4L;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
......@@ -730,10 +728,10 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_TEAM = C8F68RFW4L;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = 73H7Y3TZRJ;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 12.1;
......@@ -742,6 +740,7 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "de.fau.rrze.Network-Share-MounterUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
......@@ -760,10 +759,10 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_TEAM = C8F68RFW4L;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = 73H7Y3TZRJ;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 12.1;
......@@ -771,6 +770,7 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "de.fau.rrze.Network-Share-MounterUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = "Network Share Mounter";
......
{
"object": {
"pins": [
{
"package": "LaunchAtLogin",
"repositoryURL": "https://github.com/sindresorhus/LaunchAtLogin",
"state": {
"branch": null,
"revision": "e8171b3e38a2816f579f58f3dac1522aa39efe41",
"version": "4.2.0"
}
"pins" : [
{
"identity" : "launchatlogin",
"kind" : "remoteSourceControl",
"location" : "https://github.com/sindresorhus/LaunchAtLogin",
"state" : {
"revision" : "e8171b3e38a2816f579f58f3dac1522aa39efe41",
"version" : "4.2.0"
}
]
},
"version": 1
}
],
"version" : 2
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment