diff --git a/.gitignore b/.gitignore index 5c84c0dfb..796458fe6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,25 +5,9 @@ *.war *.ear -# Eclipse Settings Files # -.settings -.project -.classpath - # Maven # target/ pom.xml.versionsBackup -# IntelliJ Settings Files (https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems) # -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/shelf -.idea/dictionaries/** -!.idea/dictionaries/dict_* -.idea/compiler.xml -.idea/jarRepositories.xml -.idea/uiDesigner.xml -.idea/**/libraries/ -*.iml - +# Java Crash Logs hs_err_pid*.log \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..803eb5fa8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,12 @@ +# see https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems + +# Default ignored files +/shelf/ +/workspace.xml +/usage.statistics.xml +/dictionaries/ + +# generated from Maven +/modules.xml +/*.iml +/libraries/*.xml \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..18be437d6 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 000000000..c01c87f31 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 25b4cfea8..7e812ebb2 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -82,6 +82,7 @@ if ($clean -and (Test-Path -Path $appPath)) { --java-options "-Dcryptomator.ipcSocketPath=`"~/AppData/Roaming/$AppName/ipc.socket`"" ` --java-options "-Dcryptomator.keychainPath=`"~/AppData/Roaming/$AppName/keychain.json`"" ` --java-options "-Dcryptomator.mountPointsDir=`"~/$AppName`"" ` + --java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=`"$AppName`"" ` --java-options "-Dcryptomator.showTrayIcon=true" ` --java-options "-Dcryptomator.buildNumber=`"msi-$revisionNo`"" ` --resource-dir resources ` diff --git a/pom.xml b/pom.xml index c4290f374..25e874630 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 2.4.1 1.1.0 - 1.1.0 + 1.1.1 1.1.0 1.1.0 1.3.4