Merge pull request #21 from journeyapps/upgrade

Version 4.0.0 / SQLCipher 4.2.0 / SQLite 3.28.0

Author: rkistner

.circleci/config.yml

@@ -15,8 +15,9 @@ aliases:
     working_directory: ~/repo
     steps:
       - checkout
-      # Install git-lfs (not part of the standard Docker images)
-      - run: curl -sSL https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash && sudo apt-get update && sudo apt-get install -y git-lfs && git-lfs install --force && git-lfs pull
+      # Install git-lfs (not part of the standard Docker images)- run: sudo apt-get update
+      - run: curl -sSL https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
+      - run: sudo apt-get update && sudo apt-get install -y git-lfs && git-lfs install --force && git-lfs pull
       - run: npm install --build-from-source
 
       - run: npm run test
@@ -25,14 +26,15 @@ aliases:
 
   - &common-electron-linux
     docker:
-      - image: circleci/node:10.5.0
+      - image: circleci/node:10.16.0
 
     working_directory: ~/repo
 
     steps:
       - checkout
       # Install git-lfs (not part of the standard Docker images)
-      - run: curl -sSL https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash && sudo apt-get update && sudo apt-get install -y git-lfs && git-lfs install --force && git-lfs pull
+      - run: curl -sSL https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
+      - run: sudo apt-get update && sudo apt-get install -y git-lfs && git-lfs install --force && git-lfs pull
       # These are required for electron(-mocha)
       - run: sudo apt-get install -y libgtk2.0-0 libgtk-3-dev libxtst6 libxss1 libgconf2-4 libnss3 libasound2
       - run: npm install --build-from-source
@@ -41,29 +43,35 @@ aliases:
       - run: xvfb-run ./node_modules/.bin/electron-mocha --timeout 480000
       - run: *publish-command
 
-
   - &common-macos
     macos:
-      xcode: "9.1.0" # Node 8.9.0
+      xcode: "10.2.1"
     steps:
       - checkout
       - run: |
           export HOMEBREW_NO_AUTO_UPDATE=1
-          brew install git-lfs openssl || true
+          brew install git-lfs openssl@1.1 || true
       - run: git lfs install
       - run: git lfs pull
-      - restore_cache:
-          keys:
-          - v1-dependencies-macos-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-macos-{{ .Environment.CIRCLE_JOB }}
-
-      - run: npm install --build-from-source
+      - run:
+          name: Install Node
+          command: |
+            source ~/.bash_profile
+
+            # Install the correct Node version
+            curl --silent -o node.tar.xz https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-darwin-x64.tar.xz
+            tar xf node.tar.xz
+            echo 'export NODE_PATH=$HOME/node' >> $BASH_ENV
+            echo 'export PATH=$NODE_PATH/bin:$PATH' >> $BASH_ENV
+            source $BASH_ENV
+            mv node-v$NODE_VERSION-darwin-x64 $NODE_PATH
+            node -v
 
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-macos-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
+      - run:
+          name: Install & Build
+          command: |
+            node -v
+            npm install --build-from-source
 
       - run: npm run test
       - run: ./node_modules/.bin/electron-rebuild
@@ -73,82 +81,89 @@ aliases:
 
 version: 2
 jobs:
-  build-10.5.0:
-    <<: *common-build
-    docker:
-      - image: circleci/node:10.5.0
-
-  build-9.3.0:
+  build-12.6.0:
     <<: *common-build
     docker:
-      - image: circleci/node:9.3.0
+      - image: circleci/node:12.6.0
 
-  build-8.9.3:
+  build-10.16.0:
     <<: *common-build
     docker:
-      - image: circleci/node:8.9.3
+      - image: circleci/node:10.16.0
 
-  build-7.9.0:
+  build-8.16.0:
     <<: *common-build
     docker:
-      - image: circleci/node:7.9.0
+      - image: circleci/node:8.16.0
 
-  build-electron-2.0.4:
+  build-electron-5.0.6:
     <<: *common-electron-linux
     environment:
-      PRE_GYP_ARGS: --runtime=electron --target=2.0.4 --disturl=https://atom.io/download/electron
+      PRE_GYP_ARGS: --runtime=electron --target=5.0.6 --disturl=https://atom.io/download/electron
 
-  build-electron-1.8.6:
+  build-electron-4.2.6:
     <<: *common-electron-linux
     environment:
-      PRE_GYP_ARGS: --runtime=electron --target=1.8.6 --disturl=https://atom.io/download/electron
+      PRE_GYP_ARGS: --runtime=electron --target=4.2.6 --disturl=https://atom.io/download/electron
 
-  build-electron-1.7.11:
+  build-electron-3.1.11:
     <<: *common-electron-linux
     environment:
-      PRE_GYP_ARGS: --runtime=electron --target=1.7.9 --disturl=https://atom.io/download/electron
+      PRE_GYP_ARGS: --runtime=electron --target=3.1.11 --disturl=https://atom.io/download/electron
 
+  build-electron-2.0.18:
+    <<: *common-electron-linux
+    environment:
+      PRE_GYP_ARGS: --runtime=electron --target=2.0.18 --disturl=https://atom.io/download/electron
 
-  build-macos-10.1.0:
+  build-macos-12.6.0:
     <<: *common-macos
-    macos:
-      xcode: "9.3.1" # Node 10.3.0
+    environment:
+      NODE_VERSION: "12.6.0"
 
-  build-macos-8.9.0:
+  build-macos-10.16.0:
     <<: *common-macos
-    macos:
-      xcode: "9.1.0" # Node 8.9.0
+    environment:
+      NODE_VERSION: "10.16.0"
 
+  build-macos-8.16.0:
+    <<: *common-macos
+    environment:
+      NODE_VERSION: "8.16.0"
 
-  build-macos-electron-2.0.4:
+  build-macos-electron-5.0.6:
     <<: *common-macos
     environment:
-      PRE_GYP_ARGS: --runtime=electron --target=2.0.4 --disturl=https://atom.io/download/electron
+      PRE_GYP_ARGS: --runtime=electron --target=5.0.6 --disturl=https://atom.io/download/electron
+      NODE_VERSION: "10.16.0"
 
-  build-macos-electron-1.8.6:
+  build-macos-electron-4.2.6:
     <<: *common-macos
     environment:
-      PRE_GYP_ARGS: --runtime=electron --target=1.8.6 --disturl=https://atom.io/download/electron
+      PRE_GYP_ARGS: --runtime=electron --target=4.2.6 --disturl=https://atom.io/download/electron
+      NODE_VERSION: "10.16.0"
 
-  build-macos-electron-1.7.11:
+  build-macos-electron-3.1.11:
     <<: *common-macos
     environment:
-      PRE_GYP_ARGS: --runtime=electron --target=1.7.11 --disturl=https://atom.io/download/electron
+      PRE_GYP_ARGS: --runtime=electron --target=3.1.11 --disturl=https://atom.io/download/electron
+      NODE_VERSION: "10.16.0"
 
 workflows:
   version: 2
   build_all:
     jobs:
-      - build-10.5.0
-      - build-9.3.0
-      - build-8.9.3
-      - build-7.9.0
-      - build-electron-2.0.4
-      - build-electron-1.8.6
-      - build-electron-1.7.11
-      # Not working currently
-      # - build-macos-10.1.0
-      - build-macos-8.9.0
-      - build-macos-electron-2.0.4
-      - build-macos-electron-1.8.6
-      - build-macos-electron-1.7.11
+      - build-12.6.0
+      - build-10.16.0
+      - build-8.16.0
+      - build-electron-5.0.6
+      - build-electron-4.2.6
+      - build-electron-3.1.11
+      - build-electron-2.0.18
+      - build-electron-5.0.6
+      - build-macos-12.6.0
+      - build-macos-10.16.0
+      - build-macos-8.16.0
+      - build-macos-electron-5.0.6
+      - build-macos-electron-4.2.6
+      - build-macos-electron-3.1.11

.dockerignore

@@ -0,0 +1,33 @@
+#.dockerignore
+*~
+Dockerfile
+.git/
+
+#.gitignore
+*.dylib
+*.so
+*.o
+*.lo
+*.Makefile
+*.target.gyp.mk
+lib/binding
+build
+out
+Release
+Debug
+node_modules
+.deps
+Makefile.gyp
+gyp-mac-tool
+.dirstamp
+npm-debug.log
+test/support/big.db
+test/tmp
+test/nw/app.nw
+.DS_Store
+.idea
+.dtps
+local.env
+.mason
+.eslintrc.js
+setup.sh

.npmignore

@@ -18,3 +18,6 @@ setup.sh
 bin
 .circleci
 *.tgz
+cloudformation/ci.template.js
+appveyor.yml
+.vscode