From a8f535bd326fdd85e2f2d71e9b23bef9b603511e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 21 Feb 2023 16:03:12 +0100 Subject: [PATCH 1/5] use stable api version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f32d8ee..68902a9 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 17 - 1.2.0-beta4 + 1.2.0 1.7.36 From cc1bcda5f8bedb639c8f1e39f0befd694458e087 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 21 Feb 2023 16:04:16 +0100 Subject: [PATCH 2/5] bump dependency-check --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68902a9..f8fd59d 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 4.4.0 - 7.1.1 + 8.1.0 1.6.8 From b8f8bb981a93af16b516076dfbeff58062425d98 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Tue, 21 Feb 2023 17:18:09 +0100 Subject: [PATCH 3/5] Updated Xcode project, increased deployment target to macOS 10.13 --- src/main/native/Integrations.xcodeproj/project.pbxproj | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/native/Integrations.xcodeproj/project.pbxproj b/src/main/native/Integrations.xcodeproj/project.pbxproj index 9b1aae1..32103e4 100644 --- a/src/main/native/Integrations.xcodeproj/project.pbxproj +++ b/src/main/native/Integrations.xcodeproj/project.pbxproj @@ -104,7 +104,7 @@ 9E0819AF1D748ECC000C89E6 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1210; + LastUpgradeCheck = 1420; ORGANIZATIONNAME = Cryptomator; TargetAttributes = { 9E0819B61D748ECC000C89E6 = { @@ -178,6 +178,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -198,7 +199,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(JAVA_HOME)/include/**"; JAVA_HOME = "$(HOME)/.sdkman/candidates/java/current"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -236,6 +237,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -250,7 +252,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(JAVA_HOME)/include/**"; JAVA_HOME = "$(HOME)/.sdkman/candidates/java/current"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; USER_HEADER_SEARCH_PATHS = ../headers; @@ -260,6 +262,7 @@ 9E0819BC1D748ECC000C89E6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = lib; @@ -270,6 +273,7 @@ 9E0819BD1D748ECC000C89E6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = lib; From a242a8a6bc8ee5d0b9fb0db121f1a11a74cf2198 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 21 Feb 2023 17:58:25 +0100 Subject: [PATCH 4/5] use fixed maven-deploy version --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index f8fd59d..da9c1ed 100644 --- a/pom.xml +++ b/pom.xml @@ -362,6 +362,15 @@ https://maven.pkg.github.com/cryptomator/integrations-mac + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.0 + + + \ No newline at end of file From 2901d3bbbd13664a26deca0c9266dd68a66aef04 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 21 Feb 2023 22:21:27 +0100 Subject: [PATCH 5/5] prepare 1.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da9c1ed..92e17fd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.cryptomator integrations-mac - 1.3.0-SNAPSHOT + 1.2.1 Cryptomator Integrations for macOS Provides optional macOS services used by Cryptomator