Improved Windows support

Gioiamotter · Aug 4, 2020 · ffb7401 · ffb7401
1 parent 9bd2f50
commit ffb7401
Show file tree

Hide file tree

Showing 132 changed files with 8,214 additions and 8,187 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,44 +1,44 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Web related
-lib/generated_plugin_registrant.dart
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Exceptions to above rules.
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Exceptions to above rules.
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,95 +1,95 @@
-image: openjdk:8-jdk
-
-variables:
-  ANDROID_COMPILE_SDK: "28"
-  ANDROID_BUILD_TOOLS: "28.0.2"
-  ANDROID_SDK_TOOLS:   "4333796"
-
-before_script:
-  - apt-get --quiet update --yes
-  - apt-get --quiet install --yes wget tar unzip zip lib32stdc++6 lib32z1 git
-  - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip
-  - unzip -d android-sdk-linux android-sdk.zip
-  - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null
-  - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null
-  - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
-  # temporarily disable checking for EPIPE error and use yes to accept all licenses
-  - set +o pipefail
-  - yes | android-sdk-linux/tools/bin/sdkmanager --licenses
-  - set -o pipefail
-  # flutter sdk setup
-  - git clone -b master https://github.com/flutter/flutter.git /flutter
-  - export PATH=$PATH:/flutter/bin
-  - echo flutter.sdk=$PWD/flutter > android/local.properties
-  - chmod +x ./android/gradlew
-  - echo "$keybase64" > ./keybase64
-  - mkdir -p /builds/testapp-system/testapp-flutter/android/app/android/app/
-  - base64 -d ./keybase64 > /builds/testapp-system/testapp-flutter/android/app/android/app/key.jks
-  - echo "$KEYPROPERTIES" > ./android/key.properties
-
-stages:
-  - build
-  - deploy
-
-
-cache:
-  key: ${CI_COMMIT_REF_SLUG}
-  paths:
-    - build/web/
-
-build:apk:
-  stage: build
-  script:
-    - set +o pipefail
-    - flutter build apk
-    - set -o pipefail
-    - mv build/app/outputs/apk/release/app-release.apk .
-  artifacts:
-    paths:
-      - app-release.apk
-
-build:bundle:
-  stage: build
-  script:
-    - flutter build appbundle
-    - mv build/app/outputs/bundle/release/app-release.aab .
-  artifacts:
-    paths:
-      - app-release.aab
-
-build:web:
-  stage: build
-  script:
-    - flutter config --enable-web
-    - flutter pub get
-    - set +o pipefail
-    - flutter build web
-  artifacts:
-    paths:
-      - build/web/
-
-build:linux:
-  stage: build
-  script:
-    - apt-get install -qq -yy clang cmake ninja-build pkg-config libgtk-3-dev
-    - flutter config --enable-linux-desktop
-    - flutter pub get
-    - set +o pipefail
-    - flutter build linux
-    - mv build/linux/release/bundle xournalpp-mobile
-  artifacts:
-    paths:
-      - xournalpp-mobile
-
-pages:
-  stage: deploy
-  script:
-    - mkdir public
-    - cp -r build/web/* public/
-  artifacts:
-    paths:
-      - public
-  only:
-    - master
+image: openjdk:8-jdk
+
+variables:
+  ANDROID_COMPILE_SDK: "28"
+  ANDROID_BUILD_TOOLS: "28.0.2"
+  ANDROID_SDK_TOOLS:   "4333796"
+
+before_script:
+  - apt-get --quiet update --yes
+  - apt-get --quiet install --yes wget tar unzip zip lib32stdc++6 lib32z1 git
+  - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip
+  - unzip -d android-sdk-linux android-sdk.zip
+  - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null
+  - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null
+  - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null
+  - export ANDROID_HOME=$PWD/android-sdk-linux
+  - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
+  # temporarily disable checking for EPIPE error and use yes to accept all licenses
+  - set +o pipefail
+  - yes | android-sdk-linux/tools/bin/sdkmanager --licenses
+  - set -o pipefail
+  # flutter sdk setup
+  - git clone -b master https://github.com/flutter/flutter.git /flutter
+  - export PATH=$PATH:/flutter/bin
+  - echo flutter.sdk=$PWD/flutter > android/local.properties
+  - chmod +x ./android/gradlew
+  - echo "$keybase64" > ./keybase64
+  - mkdir -p /builds/testapp-system/testapp-flutter/android/app/android/app/
+  - base64 -d ./keybase64 > /builds/testapp-system/testapp-flutter/android/app/android/app/key.jks
+  - echo "$KEYPROPERTIES" > ./android/key.properties
+
+stages:
+  - build
+  - deploy
+
+
+cache:
+  key: ${CI_COMMIT_REF_SLUG}
+  paths:
+    - build/web/
+
+build:apk:
+  stage: build
+  script:
+    - set +o pipefail
+    - flutter build apk
+    - set -o pipefail
+    - mv build/app/outputs/apk/release/app-release.apk .
+  artifacts:
+    paths:
+      - app-release.apk
+
+build:bundle:
+  stage: build
+  script:
+    - flutter build appbundle
+    - mv build/app/outputs/bundle/release/app-release.aab .
+  artifacts:
+    paths:
+      - app-release.aab
+
+build:web:
+  stage: build
+  script:
+    - flutter config --enable-web
+    - flutter pub get
+    - set +o pipefail
+    - flutter build web
+  artifacts:
+    paths:
+      - build/web/
+
+build:linux:
+  stage: build
+  script:
+    - apt-get install -qq -yy clang cmake ninja-build pkg-config libgtk-3-dev
+    - flutter config --enable-linux-desktop
+    - flutter pub get
+    - set +o pipefail
+    - flutter build linux
+    - mv build/linux/release/bundle xournalpp-mobile
+  artifacts:
+    paths:
+      - xournalpp-mobile
+
+pages:
+  stage: deploy
+  script:
+    - mkdir public
+    - cp -r build/web/* public/
+  artifacts:
+    paths:
+      - public
+  only:
+    - master
diff --git a/.metadata b/.metadata
@@ -1,10 +1,10 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: 54c9441723ec61baaeb0fbf71fdcf4e415116e6e
-  channel: master
-
-project_type: app
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 54c9441723ec61baaeb0fbf71fdcf4e415116e6e
+  channel: master
+
+project_type: app