From af1801743ecd97373d15de445c77a63dccaba89c Mon Sep 17 00:00:00 2001 From: Dominik Toton <166132265+dtscalac@users.noreply.github.com> Date: Tue, 4 Jun 2024 15:09:58 +0200 Subject: [PATCH] chore: upgrade flutter to 3.22.1 (#515) * chore: upgrade flutter to 3.22.1, dart to 3.3.4 * chore: run code generator * chore: upgrade android code to be compatible with latest flutter version * chore: upgrade ios project * fix: restore generated swagger files * fix: `cat-voice` flutter builder ci (#521) * fix: add earthly ignore * fix: use flutter ci from cat ci * fix: flutter build target * fix: update cat-gateway code gen * fix: earthly ignore * fix: update build * fix: flutter build target * fix: flutter builder * fix: remove browser installer * chore: upgrade flutter web projects * fix: revert wrong nginx app path --------- Co-authored-by: Dominik Toton Co-authored-by: Lucio Baglione Co-authored-by: Steven Johnson Co-authored-by: bkioshn <35752733+bkioshn@users.noreply.github.com> --- .earthlyignore | 8 + catalyst_voices/Earthfile | 95 +++---- catalyst_voices/README.md | 4 +- catalyst_voices/android/app/build.gradle | 16 +- .../app/FlutterMultiDexApplication.java | 25 -- catalyst_voices/android/build.gradle | 13 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- catalyst_voices/android/settings.gradle | 30 ++- catalyst_voices/ios/Podfile.lock | 6 +- .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../example/pubspec.yaml | 4 +- .../example/web/index.html | 23 +- .../catalyst_voices_assets/pubspec.yaml | 4 +- .../catalyst_voices_blocs/pubspec.yaml | 4 +- .../catalyst_voices_brands/pubspec.yaml | 4 +- .../catalyst_voices_localization/pubspec.yaml | 6 +- .../catalyst_voices_models/pubspec.yaml | 2 +- .../catalyst_voices_repositories/pubspec.yaml | 4 +- .../cat_gateway_api.enums.swagger.dart | 28 +- .../cat_gateway_api.models.swagger.dart | 248 ++++++++++++++---- .../cat_gateway_api.models.swagger.g.dart | 8 +- .../cat_gateway_api.swagger.dart | 2 +- .../catalyst_voices_services/pubspec.yaml | 4 +- .../catalyst_voices_shared/pubspec.yaml | 4 +- .../catalyst_voices_view_models/pubspec.yaml | 4 +- catalyst_voices/pubspec.yaml | 4 +- catalyst_voices/test_driver/Earthfile | 2 +- .../scripts/install-chrome-linux64.sh | 46 ---- .../scripts/install-edge-linux64.sh | 22 -- .../scripts/install-firefox-linux64.sh | 35 --- catalyst_voices/web/index.html | 68 +---- .../catalyst_analysis/example/pubspec.yaml | 2 +- .../catalyst_analysis/pubspec.yaml | 2 +- .../catalyst_cardano/example/pubspec.yaml | 4 +- .../catalyst_cardano/example/web/index.html | 23 +- .../catalyst_cardano/pubspec.yaml | 4 +- .../pubspec.yaml | 4 +- .../catalyst_cardano_web/pubspec.yaml | 4 +- .../catalyst_cardano_serialization/README.md | 4 +- .../pubspec.yaml | 2 +- melos.yaml | 4 +- .../example/android/settings.gradle | 2 +- .../example/web/index.html | 23 +- .../pubspec.yaml | 4 +- 45 files changed, 355 insertions(+), 456 deletions(-) create mode 100644 .earthlyignore delete mode 100644 catalyst_voices/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java delete mode 100644 catalyst_voices/test_driver/scripts/install-chrome-linux64.sh delete mode 100644 catalyst_voices/test_driver/scripts/install-edge-linux64.sh delete mode 100644 catalyst_voices/test_driver/scripts/install-firefox-linux64.sh diff --git a/.earthlyignore b/.earthlyignore new file mode 100644 index 0000000000..9e2e87b24b --- /dev/null +++ b/.earthlyignore @@ -0,0 +1,8 @@ +# Files and directories created by pub +.dart_tool/ +.packages +build/ +pubspec.lock +pubspec_overrides.yaml +.flutter-plugins +.flutter-plugins-dependencies \ No newline at end of file diff --git a/catalyst_voices/Earthfile b/catalyst_voices/Earthfile index d1c95b88b0..64de80ff28 100644 --- a/catalyst_voices/Earthfile +++ b/catalyst_voices/Earthfile @@ -1,38 +1,13 @@ VERSION 0.8 IMPORT ../catalyst-gateway AS catalyst-gateway +IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:fix/flutter-builder-ci AS flutter-ci -# If running this target with a local ssh agent active, set the environment -# variable EARTHLY_SSH_AUTH_SOCK='' to make the `+deps` target work. Earthly -# defaults to ssh authentication when it founds an ssh agent active but the -# flutter repo needs to be cloned via https to properly use the `channel` -# subcommand. -deps: - FROM debian:bookworm-slim - ARG TARGETARCH - ARG FLUTTER_VERSION=3.19.5 - RUN apt-get update - RUN apt-get install -y git curl unzip bzip2 bash jq gpg lcov - COPY --dir test_driver/scripts . - RUN chmod +x scripts/install-chrome-linux64.sh && ./scripts/install-chrome-linux64.sh - RUN chmod +x scripts/install-edge-linux64.sh && ./scripts/install-edge-linux64.sh - RUN chmod +x scripts/install-firefox-linux64.sh && ./scripts/install-firefox-linux64.sh - - WORKDIR /frontend - - RUN git clone --depth 1 --branch $FLUTTER_VERSION https://github.com/flutter/flutter.git /usr/local/flutter - ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:$HOME/.pub-cache/bin:${PATH}" - RUN flutter --version - RUN flutter doctor -v - RUN flutter config --enable-web - RUN dart pub global activate melos - RUN dart pub global activate junitreport - RUN dart pub global activate coverage - -src: - FROM +deps +# builder - Copy all the necessary files and running bootstrap +builder: + DO flutter-ci+SETUP COPY ../+repo-catalyst-voices-all/repo . - RUN melos bootstrap + DO flutter-ci+BOOTSTRAP # code-generator - Generates flutter code. # Based on Catalyst Gateway OpenAPI specifications generates models, clients @@ -41,60 +16,54 @@ src: # proper folder of `catalyst_voices_services` local code. code-generator: ARG save_locally=false - - FROM +src - WORKDIR /frontend/catalyst_voices/packages/catalyst_voices_services + + LET gen_code_path = lib/generated/catalyst_gateway + LET local_gen_code_path = packages/catalyst_voices_services/lib/generated/catalyst_gateway/ + + FROM +builder + WORKDIR catalyst_voices/packages/catalyst_voices_services COPY catalyst-gateway+build/doc/cat-gateway-api.json openapi/cat-gateway-api.json - RUN flutter pub get - RUN dart run build_runner build --delete-conflicting-outputs + DO flutter-ci+OPENAPI_CODE_GEN \ + --SAVE_LOCALLY=$save_locally \ + --GEN_CODE_PATH=$gen_code_path \ + --LOCAL_GEN_CODE_PATH=$local_gen_code_path - IF [ $save_locally = true ] - SAVE ARTIFACT lib/generated/catalyst_gateway/* AS LOCAL ./packages/catalyst_voices_services/lib/generated/catalyst_gateway/ - ELSE - SAVE ARTIFACT lib/generated/catalyst_gateway - END # check-flutter-code-generator - Checks that the code generation is consistent # with the generated code currently in the repo. -# TODO: enable it -flutter-code-generator: +check-flutter-code-generator: FROM +code-generator # Copy generated files in the local file tree to a temporary folder COPY packages/catalyst_voices_services/lib/generated/catalyst_gateway /tmp/repo_generated # Check diff between local code and earthly artifacts RUN diff /tmp/repo_generated lib/generated/catalyst_gateway +# check-static-analysis - Runs static analysis on the code check-static-analysis: - FROM +src - RUN melos analyze --fatal-infos --fatal-warnings + FROM +builder + DO flutter-ci+ANALYZE +# check-code-formatting - Runs code formatting checks check-code-formatting: - FROM +src - RUN melos run format-check - -# Build web version of Catalyst Voices -build: - FROM +src - - WORKDIR /frontend/catalyst_voices - RUN flutter clean - RUN flutter pub get - RUN flutter build web --web-renderer canvaskit --release --target lib/configs/main_web.dart + FROM +builder + DO flutter-ci+FORMAT - WORKDIR /frontend/catalyst_voices/build - SAVE ARTIFACT web /web AS LOCAL web +# build-web - Build web version of Catalyst Voices +build-web: + FROM +builder + ARG WORKDIR=/frontend/catalyst_voices + DO flutter-ci+BUILD_WEB --TARGET=lib/configs/main_web.dart --WORKDIR=$WORKDIR + SAVE ARTIFACT web +# test-unit - Run unit tests test-unit: - FROM +src - RUN melos run test-report - WAIT - SAVE ARTIFACT test_reports AS LOCAL test_reports - END + FROM +builder + DO flutter-ci+UNIT_TESTS package: FROM nginx:alpine3.18 ARG tag='latest' - COPY +build/web /app + COPY +build-web/web /app COPY ./nginx.conf /etc/nginx/nginx.conf EXPOSE 80 diff --git a/catalyst_voices/README.md b/catalyst_voices/README.md index 6e582eb05a..33301773f5 100644 --- a/catalyst_voices/README.md +++ b/catalyst_voices/README.md @@ -14,8 +14,8 @@ This repository contains the Catalyst Voices app and packages. ## Requirements -* flutter: 3.19.+ -* Dart: 3.3.0+ +* flutter: 3.22.1+ +* Dart: 3.3.4+ * Ruby: 2.5+ * Xcode: 15.0+ * Android Studio: Android Studio Electric Eel | 2022.1.1 + diff --git a/catalyst_voices/android/app/build.gradle b/catalyst_voices/android/app/build.gradle index 6d581a2d3b..5b837bf96b 100644 --- a/catalyst_voices/android/app/build.gradle +++ b/catalyst_voices/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -27,10 +28,6 @@ if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion @@ -115,7 +112,6 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.3' diff --git a/catalyst_voices/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/catalyst_voices/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java deleted file mode 100644 index 752fc185d4..0000000000 --- a/catalyst_voices/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -// Generated file. -// -// If you wish to remove Flutter's multidex support, delete this entire file. -// -// Modifications to this file should be done in a copy under a different name -// as this file may be regenerated. - -package io.flutter.app; - -import android.app.Application; -import android.content.Context; -import androidx.annotation.CallSuper; -import androidx.multidex.MultiDex; - -/** - * Extension of {@link android.app.Application}, adding multidex support. - */ -public class FlutterMultiDexApplication extends Application { - @Override - @CallSuper - protected void attachBaseContext(Context base) { - super.attachBaseContext(base); - MultiDex.install(this); - } -} diff --git a/catalyst_voices/android/build.gradle b/catalyst_voices/android/build.gradle index 565252b7b3..b42eb3a732 100644 --- a/catalyst_voices/android/build.gradle +++ b/catalyst_voices/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.22' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/catalyst_voices/android/gradle/wrapper/gradle-wrapper.properties b/catalyst_voices/android/gradle/wrapper/gradle-wrapper.properties index cc5527d781..aeaff6f869 100644 --- a/catalyst_voices/android/gradle/wrapper/gradle-wrapper.properties +++ b/catalyst_voices/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip diff --git a/catalyst_voices/android/settings.gradle b/catalyst_voices/android/settings.gradle index 44e62bcf06..8803b78d81 100644 --- a/catalyst_voices/android/settings.gradle +++ b/catalyst_voices/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.3.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.22" apply false +} + +include ":app" \ No newline at end of file diff --git a/catalyst_voices/ios/Podfile.lock b/catalyst_voices/ios/Podfile.lock index 01f6fe0819..3fccb57652 100644 --- a/catalyst_voices/ios/Podfile.lock +++ b/catalyst_voices/ios/Podfile.lock @@ -32,10 +32,10 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be - integration_test: 13825b8a9334a850581300559b8839134b124670 + integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4 path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c - url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 + url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 PODFILE CHECKSUM: ff9ae414ffbc80ad6f9d2058e299051a15f6eca7 -COCOAPODS: 1.15.0 +COCOAPODS: 1.15.2 diff --git a/catalyst_voices/ios/Runner.xcodeproj/project.pbxproj b/catalyst_voices/ios/Runner.xcodeproj/project.pbxproj index 68d5f16389..1c0528367b 100644 --- a/catalyst_voices/ios/Runner.xcodeproj/project.pbxproj +++ b/catalyst_voices/ios/Runner.xcodeproj/project.pbxproj @@ -287,7 +287,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/catalyst_voices/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/catalyst_voices/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 2ff054957f..b2054ee901 100644 --- a/catalyst_voices/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/catalyst_voices/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: catalyst_voices_assets: diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/web/index.html b/catalyst_voices/packages/catalyst_voices_assets/example/web/index.html index 45cf2ca304..1aa025dd68 100644 --- a/catalyst_voices/packages/catalyst_voices_assets/example/web/index.html +++ b/catalyst_voices/packages/catalyst_voices_assets/example/web/index.html @@ -31,29 +31,8 @@ example - - - - - + diff --git a/catalyst_voices/packages/catalyst_voices_assets/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_assets/pubspec.yaml index b469ea2c33..d89de70af6 100644 --- a/catalyst_voices/packages/catalyst_voices_assets/pubspec.yaml +++ b/catalyst_voices/packages/catalyst_voices_assets/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: flutter: diff --git a/catalyst_voices/packages/catalyst_voices_blocs/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_blocs/pubspec.yaml index 66eec14867..8c954f8b7d 100644 --- a/catalyst_voices/packages/catalyst_voices_blocs/pubspec.yaml +++ b/catalyst_voices/packages/catalyst_voices_blocs/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: bloc: ^8.1.2 diff --git a/catalyst_voices/packages/catalyst_voices_brands/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_brands/pubspec.yaml index c77b7a4a4a..36907d7474 100644 --- a/catalyst_voices/packages/catalyst_voices_brands/pubspec.yaml +++ b/catalyst_voices/packages/catalyst_voices_brands/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: catalyst_voices_assets: diff --git a/catalyst_voices/packages/catalyst_voices_localization/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_localization/pubspec.yaml index 2e5dafb8a4..0d7ca8794b 100644 --- a/catalyst_voices/packages/catalyst_voices_localization/pubspec.yaml +++ b/catalyst_voices/packages/catalyst_voices_localization/pubspec.yaml @@ -4,15 +4,15 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: flutter: sdk: flutter flutter_localizations: sdk: flutter - intl: ^0.18.1 + intl: ^0.19.0 dev_dependencies: flutter_test: diff --git a/catalyst_voices/packages/catalyst_voices_models/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_models/pubspec.yaml index 9db3b630cf..17f232d027 100644 --- a/catalyst_voices/packages/catalyst_voices_models/pubspec.yaml +++ b/catalyst_voices/packages/catalyst_voices_models/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" + sdk: ">=3.3.4 <4.0.0" dependencies: equatable: ^2.0.5 diff --git a/catalyst_voices/packages/catalyst_voices_repositories/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_repositories/pubspec.yaml index 920c3b6b08..78ac6e30d1 100644 --- a/catalyst_voices/packages/catalyst_voices_repositories/pubspec.yaml +++ b/catalyst_voices/packages/catalyst_voices_repositories/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: catalyst_voices_models: diff --git a/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.enums.swagger.dart b/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.enums.swagger.dart index 0b7f02760e..bfe9f1faa1 100644 --- a/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.enums.swagger.dart +++ b/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.enums.swagger.dart @@ -1,7 +1,7 @@ import 'package:json_annotation/json_annotation.dart'; import 'package:collection/collection.dart'; -enum DeepQueryInspection { +enum DeepQueryInspectionFlag { @JsonValue(null) swaggerGeneratedUnknown(null), @@ -12,7 +12,7 @@ enum DeepQueryInspection { final String? value; - const DeepQueryInspection(this.value); + const DeepQueryInspectionFlag(this.value); } enum LogLevel { @@ -82,3 +82,27 @@ enum VoterGroupId { const VoterGroupId(this.value); } + +enum VotingInfoDelegationsType { + @JsonValue(null) + swaggerGeneratedUnknown(null), + + @JsonValue('Delegated') + delegated('Delegated'); + + final String? value; + + const VotingInfoDelegationsType(this.value); +} + +enum VotingInfoDirectVoterType { + @JsonValue(null) + swaggerGeneratedUnknown(null), + + @JsonValue('Direct') + direct('Direct'); + + final String? value; + + const VotingInfoDirectVoterType(this.value); +} diff --git a/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.models.swagger.dart b/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.models.swagger.dart index f26998df9c..9b06413c74 100644 --- a/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.models.swagger.dart +++ b/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.models.swagger.dart @@ -1371,8 +1371,12 @@ class VotingInfoDelegations { static const toJsonFactory = _$VotingInfoDelegationsToJson; Map toJson() => _$VotingInfoDelegationsToJson(this); - @JsonKey(name: 'type') - final String type; + @JsonKey( + name: 'type', + toJson: votingInfoDelegationsTypeToJson, + fromJson: votingInfoDelegationsTypeFromJson, + ) + final enums.VotingInfoDelegationsType type; @JsonKey(name: 'delegations', defaultValue: []) final List delegations; static const fromJsonFactory = _$VotingInfoDelegationsFromJson; @@ -1400,13 +1404,14 @@ class VotingInfoDelegations { extension $VotingInfoDelegationsExtension on VotingInfoDelegations { VotingInfoDelegations copyWith( - {String? type, List? delegations}) { + {enums.VotingInfoDelegationsType? type, List? delegations}) { return VotingInfoDelegations( type: type ?? this.type, delegations: delegations ?? this.delegations); } VotingInfoDelegations copyWithWrapped( - {Wrapped? type, Wrapped>? delegations}) { + {Wrapped? type, + Wrapped>? delegations}) { return VotingInfoDelegations( type: (type != null ? type.value : this.type), delegations: @@ -1427,8 +1432,12 @@ class VotingInfoDirectVoter { static const toJsonFactory = _$VotingInfoDirectVoterToJson; Map toJson() => _$VotingInfoDirectVoterToJson(this); - @JsonKey(name: 'type') - final String type; + @JsonKey( + name: 'type', + toJson: votingInfoDirectVoterTypeToJson, + fromJson: votingInfoDirectVoterTypeFromJson, + ) + final enums.VotingInfoDirectVoterType type; @JsonKey(name: 'voting_key') final String votingKey; static const fromJsonFactory = _$VotingInfoDirectVoterFromJson; @@ -1455,88 +1464,91 @@ class VotingInfoDirectVoter { } extension $VotingInfoDirectVoterExtension on VotingInfoDirectVoter { - VotingInfoDirectVoter copyWith({String? type, String? votingKey}) { + VotingInfoDirectVoter copyWith( + {enums.VotingInfoDirectVoterType? type, String? votingKey}) { return VotingInfoDirectVoter( type: type ?? this.type, votingKey: votingKey ?? this.votingKey); } VotingInfoDirectVoter copyWithWrapped( - {Wrapped? type, Wrapped? votingKey}) { + {Wrapped? type, + Wrapped? votingKey}) { return VotingInfoDirectVoter( type: (type != null ? type.value : this.type), votingKey: (votingKey != null ? votingKey.value : this.votingKey)); } } -String? deepQueryInspectionNullableToJson( - enums.DeepQueryInspection? deepQueryInspection) { - return deepQueryInspection?.value; +String? deepQueryInspectionFlagNullableToJson( + enums.DeepQueryInspectionFlag? deepQueryInspectionFlag) { + return deepQueryInspectionFlag?.value; } -String? deepQueryInspectionToJson( - enums.DeepQueryInspection deepQueryInspection) { - return deepQueryInspection.value; +String? deepQueryInspectionFlagToJson( + enums.DeepQueryInspectionFlag deepQueryInspectionFlag) { + return deepQueryInspectionFlag.value; } -enums.DeepQueryInspection deepQueryInspectionFromJson( - Object? deepQueryInspection, [ - enums.DeepQueryInspection? defaultValue, +enums.DeepQueryInspectionFlag deepQueryInspectionFlagFromJson( + Object? deepQueryInspectionFlag, [ + enums.DeepQueryInspectionFlag? defaultValue, ]) { - return enums.DeepQueryInspection.values - .firstWhereOrNull((e) => e.value == deepQueryInspection) ?? + return enums.DeepQueryInspectionFlag.values + .firstWhereOrNull((e) => e.value == deepQueryInspectionFlag) ?? defaultValue ?? - enums.DeepQueryInspection.swaggerGeneratedUnknown; + enums.DeepQueryInspectionFlag.swaggerGeneratedUnknown; } -enums.DeepQueryInspection? deepQueryInspectionNullableFromJson( - Object? deepQueryInspection, [ - enums.DeepQueryInspection? defaultValue, +enums.DeepQueryInspectionFlag? deepQueryInspectionFlagNullableFromJson( + Object? deepQueryInspectionFlag, [ + enums.DeepQueryInspectionFlag? defaultValue, ]) { - if (deepQueryInspection == null) { + if (deepQueryInspectionFlag == null) { return null; } - return enums.DeepQueryInspection.values - .firstWhereOrNull((e) => e.value == deepQueryInspection) ?? + return enums.DeepQueryInspectionFlag.values + .firstWhereOrNull((e) => e.value == deepQueryInspectionFlag) ?? defaultValue; } -String deepQueryInspectionExplodedListToJson( - List? deepQueryInspection) { - return deepQueryInspection?.map((e) => e.value!).join(',') ?? ''; +String deepQueryInspectionFlagExplodedListToJson( + List? deepQueryInspectionFlag) { + return deepQueryInspectionFlag?.map((e) => e.value!).join(',') ?? ''; } -List deepQueryInspectionListToJson( - List? deepQueryInspection) { - if (deepQueryInspection == null) { +List deepQueryInspectionFlagListToJson( + List? deepQueryInspectionFlag) { + if (deepQueryInspectionFlag == null) { return []; } - return deepQueryInspection.map((e) => e.value!).toList(); + return deepQueryInspectionFlag.map((e) => e.value!).toList(); } -List deepQueryInspectionListFromJson( - List? deepQueryInspection, [ - List? defaultValue, +List deepQueryInspectionFlagListFromJson( + List? deepQueryInspectionFlag, [ + List? defaultValue, ]) { - if (deepQueryInspection == null) { + if (deepQueryInspectionFlag == null) { return defaultValue ?? []; } - return deepQueryInspection - .map((e) => deepQueryInspectionFromJson(e.toString())) + return deepQueryInspectionFlag + .map((e) => deepQueryInspectionFlagFromJson(e.toString())) .toList(); } -List? deepQueryInspectionNullableListFromJson( - List? deepQueryInspection, [ - List? defaultValue, +List? + deepQueryInspectionFlagNullableListFromJson( + List? deepQueryInspectionFlag, [ + List? defaultValue, ]) { - if (deepQueryInspection == null) { + if (deepQueryInspectionFlag == null) { return defaultValue; } - return deepQueryInspection - .map((e) => deepQueryInspectionFromJson(e.toString())) + return deepQueryInspectionFlag + .map((e) => deepQueryInspectionFlagFromJson(e.toString())) .toList(); } @@ -1798,6 +1810,152 @@ List? voterGroupIdNullableListFromJson( return voterGroupId.map((e) => voterGroupIdFromJson(e.toString())).toList(); } +String? votingInfoDelegationsTypeNullableToJson( + enums.VotingInfoDelegationsType? votingInfoDelegationsType) { + return votingInfoDelegationsType?.value; +} + +String? votingInfoDelegationsTypeToJson( + enums.VotingInfoDelegationsType votingInfoDelegationsType) { + return votingInfoDelegationsType.value; +} + +enums.VotingInfoDelegationsType votingInfoDelegationsTypeFromJson( + Object? votingInfoDelegationsType, [ + enums.VotingInfoDelegationsType? defaultValue, +]) { + return enums.VotingInfoDelegationsType.values + .firstWhereOrNull((e) => e.value == votingInfoDelegationsType) ?? + defaultValue ?? + enums.VotingInfoDelegationsType.swaggerGeneratedUnknown; +} + +enums.VotingInfoDelegationsType? votingInfoDelegationsTypeNullableFromJson( + Object? votingInfoDelegationsType, [ + enums.VotingInfoDelegationsType? defaultValue, +]) { + if (votingInfoDelegationsType == null) { + return null; + } + return enums.VotingInfoDelegationsType.values + .firstWhereOrNull((e) => e.value == votingInfoDelegationsType) ?? + defaultValue; +} + +String votingInfoDelegationsTypeExplodedListToJson( + List? votingInfoDelegationsType) { + return votingInfoDelegationsType?.map((e) => e.value!).join(',') ?? ''; +} + +List votingInfoDelegationsTypeListToJson( + List? votingInfoDelegationsType) { + if (votingInfoDelegationsType == null) { + return []; + } + + return votingInfoDelegationsType.map((e) => e.value!).toList(); +} + +List votingInfoDelegationsTypeListFromJson( + List? votingInfoDelegationsType, [ + List? defaultValue, +]) { + if (votingInfoDelegationsType == null) { + return defaultValue ?? []; + } + + return votingInfoDelegationsType + .map((e) => votingInfoDelegationsTypeFromJson(e.toString())) + .toList(); +} + +List? + votingInfoDelegationsTypeNullableListFromJson( + List? votingInfoDelegationsType, [ + List? defaultValue, +]) { + if (votingInfoDelegationsType == null) { + return defaultValue; + } + + return votingInfoDelegationsType + .map((e) => votingInfoDelegationsTypeFromJson(e.toString())) + .toList(); +} + +String? votingInfoDirectVoterTypeNullableToJson( + enums.VotingInfoDirectVoterType? votingInfoDirectVoterType) { + return votingInfoDirectVoterType?.value; +} + +String? votingInfoDirectVoterTypeToJson( + enums.VotingInfoDirectVoterType votingInfoDirectVoterType) { + return votingInfoDirectVoterType.value; +} + +enums.VotingInfoDirectVoterType votingInfoDirectVoterTypeFromJson( + Object? votingInfoDirectVoterType, [ + enums.VotingInfoDirectVoterType? defaultValue, +]) { + return enums.VotingInfoDirectVoterType.values + .firstWhereOrNull((e) => e.value == votingInfoDirectVoterType) ?? + defaultValue ?? + enums.VotingInfoDirectVoterType.swaggerGeneratedUnknown; +} + +enums.VotingInfoDirectVoterType? votingInfoDirectVoterTypeNullableFromJson( + Object? votingInfoDirectVoterType, [ + enums.VotingInfoDirectVoterType? defaultValue, +]) { + if (votingInfoDirectVoterType == null) { + return null; + } + return enums.VotingInfoDirectVoterType.values + .firstWhereOrNull((e) => e.value == votingInfoDirectVoterType) ?? + defaultValue; +} + +String votingInfoDirectVoterTypeExplodedListToJson( + List? votingInfoDirectVoterType) { + return votingInfoDirectVoterType?.map((e) => e.value!).join(',') ?? ''; +} + +List votingInfoDirectVoterTypeListToJson( + List? votingInfoDirectVoterType) { + if (votingInfoDirectVoterType == null) { + return []; + } + + return votingInfoDirectVoterType.map((e) => e.value!).toList(); +} + +List votingInfoDirectVoterTypeListFromJson( + List? votingInfoDirectVoterType, [ + List? defaultValue, +]) { + if (votingInfoDirectVoterType == null) { + return defaultValue ?? []; + } + + return votingInfoDirectVoterType + .map((e) => votingInfoDirectVoterTypeFromJson(e.toString())) + .toList(); +} + +List? + votingInfoDirectVoterTypeNullableListFromJson( + List? votingInfoDirectVoterType, [ + List? defaultValue, +]) { + if (votingInfoDirectVoterType == null) { + return defaultValue; + } + + return votingInfoDirectVoterType + .map((e) => votingInfoDirectVoterTypeFromJson(e.toString())) + .toList(); +} + // ignore: unused_element String? _dateToJson(DateTime? date) { if (date == null) { diff --git a/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.models.swagger.g.dart b/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.models.swagger.g.dart index d953798421..9a106a7e11 100644 --- a/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.models.swagger.g.dart +++ b/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.models.swagger.g.dart @@ -311,7 +311,7 @@ Map _$VotingInfoToJson(VotingInfo instance) => VotingInfoDelegations _$VotingInfoDelegationsFromJson( Map json) => VotingInfoDelegations( - type: json['type'] as String, + type: votingInfoDelegationsTypeFromJson(json['type']), delegations: (json['delegations'] as List?) ?.map((e) => Delegation.fromJson(e as Map)) .toList() ?? @@ -321,20 +321,20 @@ VotingInfoDelegations _$VotingInfoDelegationsFromJson( Map _$VotingInfoDelegationsToJson( VotingInfoDelegations instance) => { - 'type': instance.type, + 'type': votingInfoDelegationsTypeToJson(instance.type), 'delegations': instance.delegations.map((e) => e.toJson()).toList(), }; VotingInfoDirectVoter _$VotingInfoDirectVoterFromJson( Map json) => VotingInfoDirectVoter( - type: json['type'] as String, + type: votingInfoDirectVoterTypeFromJson(json['type']), votingKey: json['voting_key'] as String, ); Map _$VotingInfoDirectVoterToJson( VotingInfoDirectVoter instance) => { - 'type': instance.type, + 'type': votingInfoDirectVoterTypeToJson(instance.type), 'voting_key': instance.votingKey, }; diff --git a/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.swagger.dart b/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.swagger.dart index f9212cfa52..f8c79a3345 100644 --- a/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.swagger.dart +++ b/catalyst_voices/packages/catalyst_voices_services/lib/generated/catalyst_gateway/cat_gateway_api.swagger.dart @@ -80,7 +80,7 @@ abstract class CatGatewayApi extends ChopperService { ///@param query_inspection Future apiHealthInspectionGet({ enums.LogLevel? logLevel, - enums.DeepQueryInspection? queryInspection, + enums.DeepQueryInspectionFlag? queryInspection, }) { return _apiHealthInspectionGet( logLevel: logLevel?.value?.toString(), diff --git a/catalyst_voices/packages/catalyst_voices_services/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_services/pubspec.yaml index 7a115b2ed3..fb45686a8a 100644 --- a/catalyst_voices/packages/catalyst_voices_services/pubspec.yaml +++ b/catalyst_voices/packages/catalyst_voices_services/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: chopper: ^7.2.0 diff --git a/catalyst_voices/packages/catalyst_voices_shared/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_shared/pubspec.yaml index 446dc4df82..4f9520a8c5 100644 --- a/catalyst_voices/packages/catalyst_voices_shared/pubspec.yaml +++ b/catalyst_voices/packages/catalyst_voices_shared/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: flutter: diff --git a/catalyst_voices/packages/catalyst_voices_view_models/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_view_models/pubspec.yaml index c925328b3c..b8c2a86b02 100644 --- a/catalyst_voices/packages/catalyst_voices_view_models/pubspec.yaml +++ b/catalyst_voices/packages/catalyst_voices_view_models/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: equatable: ^2.0.5 diff --git a/catalyst_voices/pubspec.yaml b/catalyst_voices/pubspec.yaml index eb8a7ce847..3a9936946b 100644 --- a/catalyst_voices/pubspec.yaml +++ b/catalyst_voices/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: animated_text_kit: ^4.2.2 diff --git a/catalyst_voices/test_driver/Earthfile b/catalyst_voices/test_driver/Earthfile index a35db067f1..61f6656df5 100644 --- a/catalyst_voices/test_driver/Earthfile +++ b/catalyst_voices/test_driver/Earthfile @@ -3,7 +3,7 @@ VERSION 0.8 IMPORT ../ AS catalyst-voices integration-test-web: - FROM catalyst-voices+build + FROM catalyst-voices+build-web ARG TARGETARCH ARG browser LET driver_port = 4444 diff --git a/catalyst_voices/test_driver/scripts/install-chrome-linux64.sh b/catalyst_voices/test_driver/scripts/install-chrome-linux64.sh deleted file mode 100644 index bdbb6cbc06..0000000000 --- a/catalyst_voices/test_driver/scripts/install-chrome-linux64.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# This script installs Chrome/Chromium for testing and Chromedriver -# There is no Chrome-for-testing build for linux/arm64, using Chromium instead -# https://github.com/GoogleChromeLabs/chrome-for-testing/issues/1 - -if [ "$TARGETARCH" == "amd64" ] -then - DISTR="Debian 12 (Bookworm)" - # Installing dependencies for Chrome. Workaround for: - # https://github.com/GoogleChromeLabs/chrome-for-testing/issues/55 - echo -e "\033[1;34mInstalling Google Chrome dependencies..." - chrome_deps=$(curl -s https://raw.githubusercontent.com/chromium/chromium/main/chrome/installer/linux/debian/dist_package_versions.json) - deps=$(echo "$chrome_deps" | jq -r ".\"$DISTR\" | keys[]") - apt-get update - for dep in $deps; do - apt-get install -y $dep - done - # Get latest chrome-for-testing version - json_chrome=$(curl -s https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json) - # Install Chrome - echo -e "\033[1;34mInstalling Google Chrome..." - latest_chrome=$(echo "$json_chrome" | jq -r ".channels.Stable.downloads.chrome[].url | select(contains(\"linux64\"))") - curl -s --create-dirs -o chrome.zip --output-dir /opt/chrome "$latest_chrome" - unzip -d /opt/chrome -j /opt/chrome/chrome.zip && rm /opt/chrome/chrome.zip - ln -s /opt/chrome/chrome /usr/local/bin/google-chrome - chmod +x /opt/chrome/chrome - google-chrome --version - # Install Chromedriver - echo -e "\033[1;34mInstalling Chromedriver..." - latest_chromedriver=$(echo "$json_chrome" | jq -r ".channels.Stable.downloads.chromedriver[].url | select(contains(\"linux64\"))") - curl -s --create-dirs -o chromedriver.zip --output-dir /opt/chromedriver "$latest_chromedriver" - unzip -d /opt/chromedriver -j /opt/chromedriver/chromedriver.zip && rm /opt/chromedriver/chromedriver.zip - ln -s /opt/chromedriver/chromedriver /usr/local/bin/chromedriver - chmod +x /opt/chromedriver/chromedriver - chromedriver --version -else - echo -e "\033[1;34mInstalling Chromium..." - apt-get update - apt-get install -y chromium - ln -s /usr/bin/chromium /usr/local/bin/google-chrome - google-chrome --version - - echo -e "\033[1;34mInstalling Chromedriver..." - apt-get install chromium-driver - chromedriver --version -fi \ No newline at end of file diff --git a/catalyst_voices/test_driver/scripts/install-edge-linux64.sh b/catalyst_voices/test_driver/scripts/install-edge-linux64.sh deleted file mode 100644 index a941a0b347..0000000000 --- a/catalyst_voices/test_driver/scripts/install-edge-linux64.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# This script installs Edge and Edgedriver. -# There is no Edge version build for linux/arm64, installing only for amd64 -# https://github.com/MicrosoftEdge/Status/issues/697 - -if [ "$TARGETARCH" == "amd64" ] -then - echo -e "\033[1;34mInstalling Edge..." - install -d -m 0755 /etc/apt/keyrings - curl -fSsL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft-edge.gpg > /dev/null - echo 'deb [signed-by=/etc/apt/keyrings/microsoft-edge.gpg] https://packages.microsoft.com/repos/edge stable main' | tee /etc/apt/sources.list.d/microsoft-edge.list - apt-get update && apt-get install -y microsoft-edge-stable - microsoft-edge-stable --version - - echo -e "\033[1;34mInstalling Edgedriver..." - edge_version=$(microsoft-edge-stable --version | grep -Eo '[0-9]+.+' | tr -d ' ') - curl -s --create-dirs -o msedgedriver.zip --output-dir /opt/msedgedriver "https://msedgedriver.azureedge.net/$edge_version/edgedriver_linux64.zip" - unzip -d /opt/msedgedriver -j /opt/msedgedriver/msedgedriver.zip && rm /opt/msedgedriver/msedgedriver.zip - ln -s /opt/msedgedriver/msedgedriver /usr/local/bin/msedgedriver - chmod +x /opt/msedgedriver/msedgedriver - msedgedriver --version -fi \ No newline at end of file diff --git a/catalyst_voices/test_driver/scripts/install-firefox-linux64.sh b/catalyst_voices/test_driver/scripts/install-firefox-linux64.sh deleted file mode 100644 index df96423519..0000000000 --- a/catalyst_voices/test_driver/scripts/install-firefox-linux64.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# This script installs Firefox and Geckodriver. Geckodriver supported versions: -# https://firefox-source-docs.mozilla.org/testing/geckodriver/Support.html -# Firefox for linux/arm64 is only in the esr or the unstable version, using the latter - -if [ "$TARGETARCH" == "amd64" ] -then - PLATFORM=linux64 - echo -e "\033[1;34mInstalling Firefox..." - install -d -m 0755 /etc/apt/keyrings - curl -fSsL https://packages.mozilla.org/apt/repo-signing-key.gpg | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null - echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null - echo ' - Package: * - Pin: origin packages.mozilla.org - Pin-Priority: 1000 - ' | tee /etc/apt/preferences.d/mozilla - apt-get update && apt-get install -y firefox - firefox --version -else - PLATFORM=linux-aarch64 - echo -e "\033[1;34mInstalling Firefox..." - echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 6ED0E7B82643E131 - apt-get update && apt-get install -y libavcodec-extra firefox - firefox --version -fi -echo -e "\033[1;34mInstalling Geckodriver..." -json_geckodriver=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest) -latest_geckodriver=$(echo "$json_geckodriver" | jq -r ".assets[].browser_download_url | select(contains(\"$PLATFORM\") and endswith(\"gz\"))") -curl -sL --create-dirs -o geckodriver.tar.gz --output-dir /opt/geckodriver "$latest_geckodriver" -tar -xzf /opt/geckodriver/geckodriver.tar.gz -C /opt/geckodriver/ && rm /opt/geckodriver/geckodriver.tar.gz -ln -s /opt/geckodriver/geckodriver /usr/local/bin/geckodriver -chmod +x /opt/geckodriver/geckodriver -geckodriver --version diff --git a/catalyst_voices/web/index.html b/catalyst_voices/web/index.html index f5a1895f81..b623f54867 100644 --- a/catalyst_voices/web/index.html +++ b/catalyst_voices/web/index.html @@ -36,73 +36,7 @@ - - + \ No newline at end of file diff --git a/catalyst_voices_packages/catalyst_analysis/example/pubspec.yaml b/catalyst_voices_packages/catalyst_analysis/example/pubspec.yaml index 7d2712e930..c84d4d4aef 100644 --- a/catalyst_voices_packages/catalyst_analysis/example/pubspec.yaml +++ b/catalyst_voices_packages/catalyst_analysis/example/pubspec.yaml @@ -4,7 +4,7 @@ description: A project that showcases how to enable the recommended lints for Ca publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" + sdk: ">=3.3.4 <4.0.0" dev_dependencies: catalyst_analysis: diff --git a/catalyst_voices_packages/catalyst_analysis/pubspec.yaml b/catalyst_voices_packages/catalyst_analysis/pubspec.yaml index 15a44ecae8..b10b674e24 100644 --- a/catalyst_voices_packages/catalyst_analysis/pubspec.yaml +++ b/catalyst_voices_packages/catalyst_analysis/pubspec.yaml @@ -6,4 +6,4 @@ issue_tracker: https://github.com/input-output-hk/catalyst-voices/issues topics: [lints, analyzer, analysis] environment: - sdk: ">=3.3.0 <4.0.0" + sdk: ">=3.3.4 <4.0.0" diff --git a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/example/pubspec.yaml b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/example/pubspec.yaml index 15131bd376..eb07b34bd3 100644 --- a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/example/pubspec.yaml +++ b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/example/pubspec.yaml @@ -5,8 +5,8 @@ publish_to: "none" version: 1.0.0+1 environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: catalyst_cardano: diff --git a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/example/web/index.html b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/example/web/index.html index 58e57287c7..3aa3e8013a 100644 --- a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/example/web/index.html +++ b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/example/web/index.html @@ -33,31 +33,10 @@ example - - - - - + \ No newline at end of file diff --git a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/pubspec.yaml b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/pubspec.yaml index 8cabcd25c8..701471ac04 100644 --- a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/pubspec.yaml +++ b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano/pubspec.yaml @@ -6,8 +6,8 @@ topics: [blockchain, cardano, cryptocurrency, wallet] version: 0.1.0 environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 flutter: plugin: diff --git a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano_platform_interface/pubspec.yaml b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano_platform_interface/pubspec.yaml index f8ff857959..543b871ba2 100644 --- a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano_platform_interface/pubspec.yaml +++ b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano_platform_interface/pubspec.yaml @@ -6,8 +6,8 @@ topics: [blockchain, cardano, cryptocurrency, wallet] version: 0.1.0 environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: catalyst_cardano_serialization: ^0.1.0 diff --git a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano_web/pubspec.yaml b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano_web/pubspec.yaml index fe6cb5edbc..49a6966b65 100644 --- a/catalyst_voices_packages/catalyst_cardano/catalyst_cardano_web/pubspec.yaml +++ b/catalyst_voices_packages/catalyst_cardano/catalyst_cardano_web/pubspec.yaml @@ -6,8 +6,8 @@ topics: [blockchain, cardano, cryptocurrency, wallet] version: 0.1.0 environment: - sdk: ^3.3.0 - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 flutter: plugin: diff --git a/catalyst_voices_packages/catalyst_cardano_serialization/README.md b/catalyst_voices_packages/catalyst_cardano_serialization/README.md index b2312df6d3..28e3999c37 100644 --- a/catalyst_voices_packages/catalyst_cardano_serialization/README.md +++ b/catalyst_voices_packages/catalyst_cardano_serialization/README.md @@ -23,8 +23,8 @@ and submission are outside of scope of this package. ## Requirements -* Dart: 3.3.0+ -* Flutter: 3.19.5+ +* Dart: 3.3.4+ +* Flutter: 3.22.1+ ## Install diff --git a/catalyst_voices_packages/catalyst_cardano_serialization/pubspec.yaml b/catalyst_voices_packages/catalyst_cardano_serialization/pubspec.yaml index c6c0c143b1..7f6185e0cb 100644 --- a/catalyst_voices_packages/catalyst_cardano_serialization/pubspec.yaml +++ b/catalyst_voices_packages/catalyst_cardano_serialization/pubspec.yaml @@ -6,7 +6,7 @@ topics: [blockchain, cardano, cryptocurrency, wallet] version: 0.1.0 environment: - sdk: ">=3.3.0 <4.0.0" + sdk: ">=3.3.4 <4.0.0" dependencies: bech32: ^0.2.2 diff --git a/melos.yaml b/melos.yaml index f930ba47bd..6a4511fde3 100644 --- a/melos.yaml +++ b/melos.yaml @@ -13,8 +13,8 @@ command: workspaceChangelog: true bootstrap: environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: bloc_concurrency: ^0.2.2 bloc: ^8.1.2 diff --git a/utilities/catalyst_voices_remote_widgets/example/android/settings.gradle b/utilities/catalyst_voices_remote_widgets/example/android/settings.gradle index 1d6d19b7f8..985a6e2ea6 100644 --- a/utilities/catalyst_voices_remote_widgets/example/android/settings.gradle +++ b/utilities/catalyst_voices_remote_widgets/example/android/settings.gradle @@ -20,7 +20,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "org.jetbrains.kotlin.android" version "1.9.22" apply false } include ":app" diff --git a/utilities/catalyst_voices_remote_widgets/example/web/index.html b/utilities/catalyst_voices_remote_widgets/example/web/index.html index 45cf2ca304..1aa025dd68 100644 --- a/utilities/catalyst_voices_remote_widgets/example/web/index.html +++ b/utilities/catalyst_voices_remote_widgets/example/web/index.html @@ -31,29 +31,8 @@ example - - - - - + diff --git a/utilities/catalyst_voices_remote_widgets/pubspec.yaml b/utilities/catalyst_voices_remote_widgets/pubspec.yaml index 0593cb728b..4495f09b73 100644 --- a/utilities/catalyst_voices_remote_widgets/pubspec.yaml +++ b/utilities/catalyst_voices_remote_widgets/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: 3.19.5 + sdk: ">=3.3.4 <4.0.0" + flutter: 3.22.1 dependencies: flutter: