Sebastian Stenzel 3 jaren geleden
bovenliggende
commit
065f32fff0
5 gewijzigde bestanden met toevoegingen van 1 en 169 verwijderingen
  1. 1 2
      .github/workflows/build.yml
  2. 0 54
      assembly-linux.xml
  3. 0 54
      assembly-mac.xml
  4. 0 54
      assembly-win.xml
  5. 0 5
      pom.xml

+ 1 - 2
.github/workflows/build.yml

@@ -350,8 +350,7 @@ jobs:
           codesign --force --deep --entitlements dist/mac/Cryptomator.entitlements -o runtime -s ${CODESIGN_IDENTITY} Cryptomator.app
       - name: Clean up codesign certificate
         if: ${{ always() }}
-        run: |
-          security delete-keychain $RUNNER_TEMP/codesign.keychain-db
+        run: security delete-keychain $RUNNER_TEMP/codesign.keychain-db
       - name: Create app.tar
         run: tar -cvf app.tar Cryptomator.app
       - name: Upload appdir-${{ matrix.profile }}

+ 0 - 54
assembly-linux.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-	<id>tarball</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>version.txt</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>LICENSE.txt</include>
-			</includes>
-			<outputDirectory></outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>launcher-linux.sh</include>
-			</includes>
-			<outputDirectory></outputDirectory>
-			<fileMode>0755</fileMode>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>cryptomator-*.jar</include>
-			</includes>
-			<outputDirectory>mods</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/mods</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>mods</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/libs</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
-	</fileSets>
-</assembly>

+ 0 - 54
assembly-mac.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-	<id>tarball</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>version.txt</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>LICENSE.txt</include>
-			</includes>
-			<outputDirectory></outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>launcher-mac.sh</include>
-			</includes>
-			<outputDirectory></outputDirectory>
-			<fileMode>0755</fileMode>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>cryptomator-*.jar</include>
-			</includes>
-			<outputDirectory>mods</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/mods</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>mods</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/libs</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
-	</fileSets>
-</assembly>

+ 0 - 54
assembly-win.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-	<id>tarball</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>version.txt</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>LICENSE.txt</include>
-			</includes>
-			<outputDirectory></outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>launcher-win.bat</include>
-			</includes>
-			<outputDirectory></outputDirectory>
-			<fileMode>0755</fileMode>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>cryptomator-*.jar</include>
-			</includes>
-			<outputDirectory>mods</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/mods</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>mods</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/libs</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
-	</fileSets>
-</assembly>

+ 0 - 5
pom.xml

@@ -240,11 +240,6 @@
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>3.2.0</version>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.3.0</version>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>