Skip to content

Commit

Permalink
Merge branch 'release/1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
infeo committed Feb 21, 2023
2 parents 76a8d15 + 2901d3b commit 9011b2a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
15 changes: 12 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>integrations-mac</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>

<name>Cryptomator Integrations for macOS</name>
<description>Provides optional macOS services used by Cryptomator</description>
Expand All @@ -30,15 +30,15 @@
<project.jdk.version>17</project.jdk.version>

<!-- runtime dependencies -->
<api.version>1.2.0-beta4</api.version>
<api.version>1.2.0</api.version>
<slf4j.version>1.7.36</slf4j.version>

<!-- test dependencies -->
<junit.jupiter.version>5.8.2</junit.jupiter.version>
<mockito.version>4.4.0</mockito.version>

<!-- build plugin dependencies -->
<dependency-check.version>7.1.1</dependency-check.version>
<dependency-check.version>8.1.0</dependency-check.version>
<nexus-staging.version>1.6.8</nexus-staging.version>
</properties>

Expand Down Expand Up @@ -362,6 +362,15 @@
<url>https://maven.pkg.github.com/cryptomator/integrations-mac</url>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.0</version>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
10 changes: 7 additions & 3 deletions src/main/native/Integrations.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
9E0819AF1D748ECC000C89E6 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1210;
LastUpgradeCheck = 1420;
ORGANIZATIONNAME = Cryptomator;
TargetAttributes = {
9E0819B61D748ECC000C89E6 = {
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -260,6 +262,7 @@
9E0819BC1D748ECC000C89E6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEAD_CODE_STRIPPING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXECUTABLE_PREFIX = lib;
Expand All @@ -270,6 +273,7 @@
9E0819BD1D748ECC000C89E6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEAD_CODE_STRIPPING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXECUTABLE_PREFIX = lib;
Expand Down

0 comments on commit 9011b2a

Please sign in to comment.