From 8bba85fb931e80f49b0dd45ec568fa0a76a51ffd Mon Sep 17 00:00:00 2001 From: jld3103 Date: Thu, 10 Aug 2023 15:17:10 +0200 Subject: [PATCH 1/4] chore: Update URLs Signed-off-by: jld3103 --- melos.yaml | 2 +- packages/app/README.md | 2 +- packages/app/pubspec.yaml | 10 +++++----- packages/neon/neon/lib/src/utils/save_file.dart | 2 +- packages/neon/neon/pubspec.yaml | 4 ++-- packages/neon/neon_files/lib/widgets/browser_view.dart | 2 +- packages/neon/neon_files/pubspec.yaml | 4 ++-- packages/neon/neon_news/pubspec.yaml | 2 +- packages/neon/neon_notes/pubspec.yaml | 2 +- packages/neon/neon_notifications/pubspec.yaml | 2 +- packages/nextcloud/README.md | 6 +++--- packages/nextcloud/pubspec.yaml | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/melos.yaml b/melos.yaml index cd523589..5cd5071b 100644 --- a/melos.yaml +++ b/melos.yaml @@ -1,5 +1,5 @@ name: nextcloud-neon -repository: https://github.com/provokateurin/nextcloud-neon +repository: https://github.com/nextcloud/neon sdkPath: .fvm/flutter_sdk diff --git a/packages/app/README.md b/packages/app/README.md index df14e68b..510f8da1 100644 --- a/packages/app/README.md +++ b/packages/app/README.md @@ -4,7 +4,7 @@ A beautiful convergent cross-platform client for Nextcloud written in Flutter. ## Install You can build it yourself from source or download it from the automatic build pipelines. -The app will be published on F-Droid, the Google Playstore and Flathub later on. See https://github.com/provokateurin/nextcloud-neon/issues/106 for the to-do list. +The app will be published on F-Droid, the Google Playstore and Flathub later on. See https://github.com/nextcloud/neon/issues/106 for the to-do list. ## Screenshots diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml index 4e96fdf4..02a86e5f 100644 --- a/packages/app/pubspec.yaml +++ b/packages/app/pubspec.yaml @@ -13,23 +13,23 @@ dependencies: flutter_svg: ^2.0.6 neon: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/neon/neon neon_files: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/neon/neon_files neon_news: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/neon/neon_news neon_notes: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/neon/neon_notes neon_notifications: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/neon/neon_notifications shared_preferences: ^2.1.1 diff --git a/packages/neon/neon/lib/src/utils/save_file.dart b/packages/neon/neon/lib/src/utils/save_file.dart index bee7df4a..d8cab3c8 100644 --- a/packages/neon/neon/lib/src/utils/save_file.dart +++ b/packages/neon/neon/lib/src/utils/save_file.dart @@ -6,7 +6,7 @@ import 'package:flutter_file_dialog/flutter_file_dialog.dart'; Future saveFileWithPickDialog(final String fileName, final Uint8List data) async { if (Platform.isAndroid || Platform.isIOS) { - // TODO: https://github.com/provokateurin/nextcloud-neon/issues/8 + // TODO: https://github.com/nextcloud/neon/issues/8 return FlutterFileDialog.saveFile( params: SaveFileDialogParams( data: data, diff --git a/packages/neon/neon/pubspec.yaml b/packages/neon/neon/pubspec.yaml index 4b25ffd4..23d77f81 100644 --- a/packages/neon/neon/pubspec.yaml +++ b/packages/neon/neon/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: meta: ^1.9.1 nextcloud: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/nextcloud package_info_plus: ^4.0.0 path: ^1.8.3 @@ -44,7 +44,7 @@ dependencies: shared_preferences: ^2.1.1 sort_box: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/sort_box sqflite: ^2.2.8+2 sqflite_common_ffi: ^2.2.5 diff --git a/packages/neon/neon_files/lib/widgets/browser_view.dart b/packages/neon/neon_files/lib/widgets/browser_view.dart index b6e61d00..543529f9 100644 --- a/packages/neon/neon_files/lib/widgets/browser_view.dart +++ b/packages/neon/neon_files/lib/widgets/browser_view.dart @@ -319,7 +319,7 @@ class _FilesBrowserViewState extends State { value: FilesFileAction.copy, child: Text(AppLocalizations.of(context).actionCopy), ), - // TODO: https://github.com/provokateurin/nextcloud-neon/issues/4 + // TODO: https://github.com/nextcloud/neon/issues/4 if (!details.isDirectory) ...[ PopupMenuItem( value: FilesFileAction.sync, diff --git a/packages/neon/neon_files/pubspec.yaml b/packages/neon/neon_files/pubspec.yaml index 5eb0e99a..d9b14ca5 100644 --- a/packages/neon/neon_files/pubspec.yaml +++ b/packages/neon/neon_files/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: collection: ^1.17.0 file_icons: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/file_icons file_picker: ^5.3.0 filesize: ^2.0.1 @@ -22,7 +22,7 @@ dependencies: material_design_icons_flutter: ^7.0.7296 neon: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/neon/neon open_file: ^3.3.1 path: ^1.8.3 diff --git a/packages/neon/neon_news/pubspec.yaml b/packages/neon/neon_news/pubspec.yaml index c7f72f62..88622223 100644 --- a/packages/neon/neon_news/pubspec.yaml +++ b/packages/neon/neon_news/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: material_design_icons_flutter: ^7.0.7296 neon: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/neon/neon provider: ^6.0.5 rxdart: ^0.27.7 diff --git a/packages/neon/neon_notes/pubspec.yaml b/packages/neon/neon_notes/pubspec.yaml index 4abff6ac..05e4a95d 100644 --- a/packages/neon/neon_notes/pubspec.yaml +++ b/packages/neon/neon_notes/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: material_design_icons_flutter: ^7.0.7296 neon: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/neon/neon provider: ^6.0.5 queue: ^3.1.0+2 diff --git a/packages/neon/neon_notifications/pubspec.yaml b/packages/neon/neon_notifications/pubspec.yaml index 5044589d..1cb138c2 100644 --- a/packages/neon/neon_notifications/pubspec.yaml +++ b/packages/neon/neon_notifications/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: material_design_icons_flutter: ^7.0.7296 neon: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/neon/neon provider: ^6.0.5 rxdart: ^0.27.7 diff --git a/packages/nextcloud/README.md b/packages/nextcloud/README.md index 52787ee4..b844ce55 100644 --- a/packages/nextcloud/README.md +++ b/packages/nextcloud/README.md @@ -2,7 +2,7 @@ A Nextcloud client written in Dart. -This client will become the replacement for https://github.com/provokateurin/dart-nextcloud at some point ([See](https://github.com/provokateurin/nextcloud-neon/issues/1)). +This client will become the replacement for https://github.com/provokateurin/dart-nextcloud at some point ([See](https://github.com/nextcloud/neon/issues/1)). ## Installing @@ -12,14 +12,14 @@ In the future this code will be available at https://pub.dev/packages/nextcloud, dependencies: nextcloud: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/nextcloud ref: $COMMIT dependency_overrides: dynamite_runtime: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/dynamite/dynamite_runtime ref: $COMMIT ``` diff --git a/packages/nextcloud/pubspec.yaml b/packages/nextcloud/pubspec.yaml index 1ae82cd0..d145c0f1 100644 --- a/packages/nextcloud/pubspec.yaml +++ b/packages/nextcloud/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: crypton: ^2.0.5 dynamite_runtime: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/dynamite/dynamite_runtime intl: ^0.18.0 json_annotation: ^4.8.1 @@ -27,7 +27,7 @@ dev_dependencies: coverage: ^1.6.3 dynamite: git: - url: https://github.com/provokateurin/nextcloud-neon + url: https://github.com/nextcloud/neon path: packages/dynamite/dynamite json_serializable: ^6.6.2 nit_picking: From 952f5ce7782fab2eecd5eb88b0a540849a22ae1d Mon Sep 17 00:00:00 2001 From: jld3103 Date: Thu, 10 Aug 2023 16:33:53 +0200 Subject: [PATCH 2/4] chore: Update project name Signed-off-by: jld3103 --- README.md | 2 +- melos.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea57bd1b..07d2d84f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# nextcloud-neon +# neon Neon logo diff --git a/melos.yaml b/melos.yaml index 5cd5071b..22aaa372 100644 --- a/melos.yaml +++ b/melos.yaml @@ -1,4 +1,4 @@ -name: nextcloud-neon +name: neon repository: https://github.com/nextcloud/neon sdkPath: .fvm/flutter_sdk From 7b62204f3b66fb222f17b3ec440f291835b8e75f Mon Sep 17 00:00:00 2001 From: jld3103 Date: Thu, 10 Aug 2023 16:35:43 +0200 Subject: [PATCH 3/4] fix(ci): Override repo url for f-droid nightly Signed-off-by: jld3103 --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e49f61d7..d80ad0f2 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -103,7 +103,7 @@ jobs: sudo apt-get purge fdroidserver pip3 install https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver.tar.gz export DEBUG_KEYSTORE=${{ secrets.DEBUG_KEYSTORE }} - fdroid nightly -v --archive-older 10 + GITHUB_REPOSITORY=provokateurin/nextcloud-neon fdroid nightly -v --archive-older 10 linux_x86_64: name: Linux x86_64 From 64cceec0daa9e362d744af7c22202e861ea4a904 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Thu, 10 Aug 2023 21:09:43 +0200 Subject: [PATCH 4/4] fix(ci): Workaround broken self-hosted runners Signed-off-by: jld3103 --- .github/workflows/conventional_commits.yaml | 2 +- .github/workflows/dart.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conventional_commits.yaml b/.github/workflows/conventional_commits.yaml index d79af13d..a569bed4 100644 --- a/.github/workflows/conventional_commits.yaml +++ b/.github/workflows/conventional_commits.yaml @@ -5,7 +5,7 @@ on: jobs: conventional-commits: name: Conventional commits - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 061539ce..58c9e929 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -14,7 +14,7 @@ permissions: read-all jobs: dart-ci: name: Dart CI - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Cache dependencies uses: actions/cache@v3