Merge pull request #34 from MarcelRobitaille/cherry-pick

Cherry pick and release 4.0.0

Author: MarcelRobitaille

.eslintrc.cjs

@@ -0,0 +1,24 @@
+/**
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+module.exports = {
+	globals: {
+		appVersion: true,
+	},
+	parserOptions: {
+		requireConfigFile: false,
+	},
+	extends: [
+		'@nextcloud',
+	],
+	rules: {
+		'jsdoc/require-jsdoc': 'off',
+		'jsdoc/tag-lines': 'off',
+		'vue/first-attribute-linebreak': 'off',
+		'import/extensions': 'off',
+		'import/no-unresolved': ['error', { ignore: ['\\?raw'] }],
+		'vue/no-v-model-argument': 'off',
+	},
+}

.eslintrc.js

@@ -160,24 +160,24 @@ jobs:
       - name: Sign app
         run: |
           # Extracting release
-          cd ${{ env.APP_NAME }}/build/artifacts
+          cd ${{ env.APP_NAME }}/build/artifacts/appstore
           tar -xvf ${{ env.APP_NAME }}.tar.gz
-          cd ../../../
+          cd ../../../../
           # Setting up keys
           echo '${{ secrets.APP_PRIVATE_KEY }}' > ${{ env.APP_NAME }}.key
           wget --quiet "https://github.com/nextcloud/app-certificate-requests/raw/master/${{ env.APP_NAME }}/${{ env.APP_NAME }}.crt"
           # Signing
-          php nextcloud/occ integrity:sign-app --privateKey=../${{ env.APP_NAME }}.key --certificate=../${{ env.APP_NAME }}.crt --path=../${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}
+          php nextcloud/occ integrity:sign-app --privateKey=../${{ env.APP_NAME }}.key --certificate=../${{ env.APP_NAME }}.crt --path=../${{ env.APP_NAME }}/build/artifacts/appstore/${{ env.APP_NAME }}
           # Rebuilding archive
-          cd ${{ env.APP_NAME }}/build/artifacts
+          cd ${{ env.APP_NAME }}/build/artifacts/appstore
           tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
 
       - name: Attach tarball to github release
         uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # v2
         id: attach_to_release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}.tar.gz
+          file: ${{ env.APP_NAME }}/build/artifacts/appstore/${{ env.APP_NAME }}.tar.gz
           asset_name: ${{ env.APP_NAME }}-${{ env.APP_VERSION }}.tar.gz
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/appstore-build-publish.yml

@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   changes:
-    runs-on: ubuntu-latest-low
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: read
@@ -87,7 +87,7 @@ jobs:
   summary:
     permissions:
       contents: none
-    runs-on: ubuntu-latest-low
+    runs-on: ubuntu-latest
     needs: [changes, lint]
 
     if: always()

.github/workflows/lint-eslint.yml

@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   xml-linters:
-    runs-on: ubuntu-latest-low
+    runs-on: ubuntu-latest
 
     name: info.xml lint
     steps:

.github/workflows/lint-info-xml.yml

@@ -25,7 +25,7 @@ concurrency:
 
 jobs:
   matrix:
-    runs-on: ubuntu-latest-low
+    runs-on: ubuntu-latest
     outputs:
       php-versions: ${{ steps.versions.outputs.php-versions }}
     steps:
@@ -69,7 +69,7 @@ jobs:
   summary:
     permissions:
       contents: none
-    runs-on: ubuntu-latest-low
+    runs-on: ubuntu-latest
     needs: php-lint
 
     if: always()

.github/workflows/lint-php.yml

@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   changes:
-    runs-on: ubuntu-latest-low
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: read
@@ -94,7 +94,7 @@ jobs:
   summary:
     permissions:
       contents: none
-    runs-on: ubuntu-latest-low
+    runs-on: ubuntu-latest
     needs: [changes, build]
 
     if: always()

.github/workflows/node.yml

@@ -25,7 +25,7 @@ permissions:
 
 jobs:
   matrix:
-    runs-on: ubuntu-latest-low
+    runs-on: ubuntu-latest
     outputs:
       ocp-matrix: ${{ steps.versions.outputs.ocp-matrix }}
     steps:
@@ -81,7 +81,7 @@ jobs:
         run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github
 
   summary:
-    runs-on: ubuntu-latest-low
+    runs-on: ubuntu-latest
     needs: static-analysis
 
     if: always()

.github/workflows/psalm-matrix.yml

@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.0.0] - 2025-08-23
+
+### Breaking changes
+
+- Drop support for Nextcloud 29
+- Drop support for Nextcloud 28
+- Drop support for Google Photos #246
+
+### Added
+
+- Allow disabling of imports of birthday events in calendar #258 @lukasdotcom
+- Use outlined icons in the UI #254 @lukasdotcom
+- Support importing other contacts #245
+- Support for Google Drawings #244
+- Vue 3 and Vite #242
+
+### Fixed
+
+- Added warning if using an IP as a redirect URI (#32)
+- Cleaned up setup page
+- Fix large office file exports #243
+- Improve sanitation of folder and file names #209
+
 ## [3.2.0] - 2025-06-11
 
 ### New

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Google Synchronization
 
 **This is a fork of the [Google Integration][integration_google] app. Do not use both at the same time!!**
+This integration supports both personal Google accounts and Google Workspace (formerly G Suite) accounts.
 
 **Use at your own risk. This app is still in early development. Users are effectively beta testers.**
 
@@ -74,6 +75,7 @@ This also allows me to decide for myself if my releases are major, minor, or pat
 
 | Google Synchronization version | Google Integration version |
 | ------------------------------ | -------------------------- |
+| 4.0.0                          | 4.1.0                      |
 | 3.2.0                          | 3.2.0                      |
 | 3.0.0                          | 3.1.0                      |
 | 2.2.0                          | 2.2.0                      |
@@ -95,6 +97,11 @@ We would be more than excited if you would like to collaborate with us. We will
 
 If there is a strong business case for any development of this app, we will consider your wishes for our roadmap. Please [contact your account manager](https://nextcloud.com/enterprise/) to talk about the possibilities.
 
+## Limitations
+
+This app can not migrate Google photos files due to limitations in the Google Photos API making it too complex for end users.
+For more information please visit [the Google Photos Documentation.](https://developers.google.com/photos/support/updates#affected-scopes-methods)
+
 ## Development guide
 
 Use the docker compose file in this repo: