From 402de821a05d91475739fdcd2e6a120e962a49d2 Mon Sep 17 00:00:00 2001 From: Marco Date: Thu, 13 Jun 2024 21:12:26 +0200 Subject: [PATCH] change package name to de.swgross.calodiary --- .metadata | 32 +++--- android/app/build.gradle | 4 +- .../com/example/calodiary/MainActivity.kt | 5 + devtools_options.yaml | 3 - ios/Runner.xcodeproj/project.pbxproj | 12 +-- lib/main.dart | 8 +- linux/CMakeLists.txt | 2 +- linux/flutter/generated_plugin_registrant.cc | 4 - linux/flutter/generated_plugins.cmake | 1 - macos/Flutter/GeneratedPluginRegistrant.swift | 4 - macos/Runner.xcodeproj/project.pbxproj | 6 +- macos/Runner/Configs/AppInfo.xcconfig | 2 +- pubspec.lock | 102 ++---------------- pubspec.yaml | 8 +- .../flutter/generated_plugin_registrant.cc | 3 - windows/flutter/generated_plugins.cmake | 1 - 16 files changed, 48 insertions(+), 149 deletions(-) create mode 100644 android/app/src/main/kotlin/com/example/calodiary/MainActivity.kt delete mode 100644 devtools_options.yaml diff --git a/.metadata b/.metadata index a159eec..c469a90 100644 --- a/.metadata +++ b/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled and should not be manually edited. version: - revision: "bc097c619af17c9c66531a085b9d99874a944c5f" - channel: "main" + revision: "2feea7a4071e25c1e3aac9c17016531bc4442f2a" + channel: "beta" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: bc097c619af17c9c66531a085b9d99874a944c5f - base_revision: bc097c619af17c9c66531a085b9d99874a944c5f + create_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a + base_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a - platform: android - create_revision: bc097c619af17c9c66531a085b9d99874a944c5f - base_revision: bc097c619af17c9c66531a085b9d99874a944c5f + create_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a + base_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a - platform: ios - create_revision: bc097c619af17c9c66531a085b9d99874a944c5f - base_revision: bc097c619af17c9c66531a085b9d99874a944c5f + create_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a + base_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a - platform: linux - create_revision: bc097c619af17c9c66531a085b9d99874a944c5f - base_revision: bc097c619af17c9c66531a085b9d99874a944c5f + create_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a + base_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a - platform: macos - create_revision: bc097c619af17c9c66531a085b9d99874a944c5f - base_revision: bc097c619af17c9c66531a085b9d99874a944c5f + create_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a + base_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a - platform: web - create_revision: bc097c619af17c9c66531a085b9d99874a944c5f - base_revision: bc097c619af17c9c66531a085b9d99874a944c5f + create_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a + base_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a - platform: windows - create_revision: bc097c619af17c9c66531a085b9d99874a944c5f - base_revision: bc097c619af17c9c66531a085b9d99874a944c5f + create_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a + base_revision: 2feea7a4071e25c1e3aac9c17016531bc4442f2a # User provided section diff --git a/android/app/build.gradle b/android/app/build.gradle index c1c7a43..736bb73 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,7 +6,7 @@ plugins { } android { - namespace = "com.example.calodiary" + namespace = "de.swgross.calodiary" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion @@ -21,7 +21,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.example.calodiary" + applicationId = "de.swgross.calodiary" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdk = flutter.minSdkVersion diff --git a/android/app/src/main/kotlin/com/example/calodiary/MainActivity.kt b/android/app/src/main/kotlin/com/example/calodiary/MainActivity.kt new file mode 100644 index 0000000..1b5d02c --- /dev/null +++ b/android/app/src/main/kotlin/com/example/calodiary/MainActivity.kt @@ -0,0 +1,5 @@ +package de.swgross.calodiary + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() diff --git a/devtools_options.yaml b/devtools_options.yaml deleted file mode 100644 index fa0b357..0000000 --- a/devtools_options.yaml +++ /dev/null @@ -1,3 +0,0 @@ -description: This file stores settings for Dart & Flutter DevTools. -documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states -extensions: diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c2bd1f8..c3517a5 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -368,7 +368,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary; + PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -384,7 +384,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -401,7 +401,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -416,7 +416,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -547,7 +547,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary; + PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -569,7 +569,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary; + PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/lib/main.dart b/lib/main.dart index c122e5e..bcf5b74 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,12 +1,12 @@ +import 'package:calodiary/perdate_widget.dart'; +import 'package:calodiary/settings.dart'; +import 'package:calodiary/settings_bloc.dart'; +import 'package:calodiary/storage/storage.dart'; import 'package:calodiary/theme_bloc.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:go_router/go_router.dart'; -import 'package:calodiary/settings_bloc.dart'; -import 'package:calodiary/perdate_widget.dart'; -import 'package:calodiary/settings.dart'; -import 'package:calodiary/storage/storage.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 7f33c0f..5519d0b 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -7,7 +7,7 @@ project(runner LANGUAGES CXX) set(BINARY_NAME "calodiary") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.calodiary") +set(APPLICATION_ID "de.swgross.calodiary") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 10e19fe..e71a16d 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -6,10 +6,6 @@ #include "generated_plugin_registrant.h" -#include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) flutter_localization_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterLocalizationPlugin"); - flutter_localization_plugin_register_with_registrar(flutter_localization_registrar); } diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 2284757..2e1de87 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - flutter_localization ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 34745dc..e777c67 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,12 +5,8 @@ import FlutterMacOS import Foundation -import flutter_localization import path_provider_foundation -import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - FlutterLocalizationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalizationPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) - SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index b6086bd..886dc1a 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -385,7 +385,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/calodiary.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/calodiary"; @@ -399,7 +399,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/calodiary.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/calodiary"; @@ -413,7 +413,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/calodiary.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/calodiary"; diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 9149f88..3b5ef93 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = calodiary // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary +PRODUCT_BUNDLE_IDENTIFIER = de.swgross.calodiary // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved. diff --git a/pubspec.lock b/pubspec.lock index 8c4589d..2b68069 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -73,14 +73,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" - file: - dependency: transitive - description: - name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" - url: "https://pub.dev" - source: hosted - version: "7.0.0" fixnum: dependency: transitive description: @@ -98,10 +90,10 @@ packages: dependency: "direct main" description: name: flutter_bloc - sha256: f0ecf6e6eb955193ca60af2d5ca39565a86b8a142452c5b24d96fb477428f4d2 + sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a url: "https://pub.dev" source: hosted - version: "8.1.5" + version: "8.1.6" flutter_lints: dependency: "direct dev" description: @@ -110,14 +102,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" - flutter_localization: - dependency: "direct main" - description: - name: flutter_localization - sha256: faaeb1eba307473032e2c2af737f36ced61fc98735608410d0a6d9c231b50912 - url: "https://pub.dev" - source: hosted - version: "0.2.0" flutter_localizations: dependency: "direct main" description: flutter @@ -137,10 +121,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: abec47eb8c8c36ebf41d0a4c64dbbe7f956e39a012b3aafc530e951bdc12fe3f + sha256: cdae1b9c8bd7efadcef6112e81c903662ef2ce105cbd220a04bbb7c3425b5554 url: "https://pub.dev" source: hosted - version: "14.1.4" + version: "14.2.0" intl: dependency: "direct main" description: @@ -281,10 +265,10 @@ packages: dependency: transitive description: name: platform - sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "3.1.5" plugin_platform_interface: dependency: transitive description: @@ -301,14 +285,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.2" - quiver: - dependency: "direct main" - description: - name: quiver - sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 - url: "https://pub.dev" - source: hosted - version: "3.2.1" settings_ui: dependency: "direct main" description: @@ -317,62 +293,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" - shared_preferences: - dependency: transitive - description: - name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 - url: "https://pub.dev" - source: hosted - version: "2.2.3" - shared_preferences_android: - dependency: transitive - description: - name: shared_preferences_android - sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577" - url: "https://pub.dev" - source: hosted - version: "2.2.3" - shared_preferences_foundation: - dependency: transitive - description: - name: shared_preferences_foundation - sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7" - url: "https://pub.dev" - source: hosted - version: "2.4.0" - shared_preferences_linux: - dependency: transitive - description: - name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - shared_preferences_platform_interface: - dependency: transitive - description: - name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - shared_preferences_web: - dependency: transitive - description: - name: shared_preferences_web - sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" - url: "https://pub.dev" - source: hosted - version: "2.3.0" - shared_preferences_windows: - dependency: transitive - description: - name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" - url: "https://pub.dev" - source: hosted - version: "2.3.2" sky_engine: dependency: transitive description: flutter @@ -474,14 +394,6 @@ packages: url: "https://pub.dev" source: hosted version: "14.2.2" - web: - dependency: transitive - description: - name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" - url: "https://pub.dev" - source: hosted - version: "0.5.1" win32: dependency: transitive description: @@ -499,5 +411,5 @@ packages: source: hosted version: "1.0.4" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0-180.3.beta <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2f544d1..ad8996a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,19 +4,17 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.0.0 + sdk: '>=3.5.0-180.3.beta <4.0.0' dependencies: flutter: sdk: flutter - flutter_bloc: ^8.1.5 - flutter_localization: ^0.2.0 + flutter_bloc: ^8.1.6 flutter_localizations: sdk: flutter - go_router: ^14.1.4 + go_router: ^14.2.0 intl: any path_provider: ^2.1.3 - quiver: ^3.2.1 settings_ui: ^2.0.2 universal_platform: ^1.1.0 uuid: ^4.4.0 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 9f5b3e5..8b6d468 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,9 +6,6 @@ #include "generated_plugin_registrant.h" -#include void RegisterPlugins(flutter::PluginRegistry* registry) { - FlutterLocalizationPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FlutterLocalizationPluginCApi")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index f040a63..b93c4c3 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - flutter_localization ) list(APPEND FLUTTER_FFI_PLUGIN_LIST