Merge branch 'develop' into release/1.1.0

cryptomator · Mar 7, 2022 · 1987c3e · 1987c3e
2 parents 0f9c99a + fad104c
commit 1987c3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -9,6 +9,7 @@
 	requires static org.jetbrains.annotations;
 
 	exports org.cryptomator.integrations.autostart;
+	exports org.cryptomator.integrations.common;
 	exports org.cryptomator.integrations.keychain;
 	exports org.cryptomator.integrations.tray;
 	exports org.cryptomator.integrations.uiappearance;

diff --git a/src/main/java/org/cryptomator/integrations/common/OperatingSystem.java b/src/main/java/org/cryptomator/integrations/common/OperatingSystem.java
@@ -1,5 +1,7 @@
 package org.cryptomator.integrations.common;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -16,6 +18,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Repeatable(OperatingSystem.OperatingSystems.class)
+@ApiStatus.Experimental
 public @interface OperatingSystem {
 	Value value() default Value.UNKNOWN;