Build support for Microsoft Windows.

2018-06-24 16:20:42 -04:00
parent 5a4456bf46
commit fffec56d4e
17 changed files with 169 additions and 201 deletions
--- a/gradle/.idea/codeStyleSettings.xml
+++ b/gradle/.idea/codeStyleSettings.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value />
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Lhunath" />
-  </component>
-</project>
--- a/gradle/.idea/copyright/GPLv3.xml
+++ b/gradle/.idea/copyright/GPLv3.xml
@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="keyword" value="Copyright|License|WARRANTY" />
-    <option name="myName" value="GPLv3" />
-    <option name="notice" value="This file is part of &amp;#36;project.name.&#10;Copyright (c) &amp;#36;today.year.&#10;&#10;&amp;#36;project.name is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;&amp;#36;project.name is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10;&#10;You can find a copy of the GNU General Public License in the&#10;LICENSE file.  Alternatively, see &lt;http://www.gnu.org/licenses/&gt;." />
-  </copyright>
-</component>
--- a/gradle/.idea/copyright/profiles_settings.xml
+++ b/gradle/.idea/copyright/profiles_settings.xml
@@ -1,13 +0,0 @@
-<component name="CopyrightManager">
-  <settings>
-    <module2copyright>
-      <element module="masterpassword" copyright="Master Password" />
-    </module2copyright>
-    <LanguageOptions name="__TEMPLATE__">
-      <option name="block" value="false" />
-      <option name="separateBefore" value="true" />
-      <option name="separateAfter" value="true" />
-      <option name="filler" value="=" />
-    </LanguageOptions>
-  </settings>
-</component>
--- a/gradle/.idea/inspectionProfiles/profiles_settings.xml
+++ b/gradle/.idea/inspectionProfiles/profiles_settings.xml
@@ -1,9 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="projectProfile" value="Lhunath" />
-    <option name="useProjectProfile" value="false" />
-    <option name="PROJECT_PROFILE" value="Lhunath" />
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
--- a/gradle/.idea/misc.xml
+++ b/gradle/.idea/misc.xml
@@ -1,45 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <type id="jpa" />
-    <type id="web" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/../../opal/pom.xml" />
-        <option value="$PROJECT_DIR$/../../pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="javax.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="javax.annotation.Nonnull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-  <component name="ThriftCompiler">
-    <compilers />
+  <component name="ProjectType">
+    <option name="id" value="Android" />
  </component>
 </project>
--- a/gradle/.idea/runConfigurations/Android.xml
+++ b/gradle/.idea/runConfigurations/Android.xml
@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Android" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="android" />
-    <option name="DEPLOY" value="true" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-    <option name="MODE" value="default_activity" />
-    <option name="PREFERRED_AVD" value="" />
-    <option name="CLEAR_LOGCAT" value="false" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-    <option name="PREFERRED_AVD" value="" />
-    <option name="DEBUGGER_TYPE" value="Java" />
-    <Java />
-    <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
-      <option name="SUPPORT_LIB_ENABLED" value="true" />
-      <option name="INSTRUMENTATION_ENABLED" value="true" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <method />
-  </configuration>
-</component>
--- a/gradle/.idea/scopes/masterpassword.xml
+++ b/gradle/.idea/scopes/masterpassword.xml
@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="masterpassword" pattern="com.lyndir.masterpassword..*" />
-</component>
--- a/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Jun 22 01:12:28 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
--- a/gradle/settings.gradle
+++ b/gradle/settings.gradle
@@ -21,9 +21,9 @@ project(':masterpassword-tests').projectDir = new File( '../platform-independent
 include 'masterpassword-gui'
 project(':masterpassword-gui').projectDir = new File( '../platform-independent/java/gui' )

-if (local.containsKey('sdk.dir')) {
+//if (local.containsKey('sdk.dir')) {
    include 'masterpassword-android'
    project(':masterpassword-android').projectDir = new File( '../platform-android' )
-} else {
-    logger.warn( "Skipping masterpassword-android since sdk.dir is not defined in local.properties." )
-}
+//} else {
+//    logger.warn( "Skipping masterpassword-android since sdk.dir is not defined in local.properties." )
+//}