Skip to content

Commit

Permalink
Bump deps (#249)
Browse files Browse the repository at this point in the history
* Bump deps
* Upgrade Flutter to 3.19.2
* Set fix macOS version (13) in build script
* Change base64 output style
* Fix lint warnings
* Set lint rule: dangling_library_doc_comments: false
* Set intl package version to any for better compatibility

Also the iOS version of OpenStop is now build with iOS SDK version 17.
  • Loading branch information
7h30n3 authored Mar 7, 2024
1 parent e604eaa commit 31ba269
Show file tree
Hide file tree
Showing 38 changed files with 266 additions and 235 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:

build_ios:
name: Build for iOS
runs-on: macos-latest
runs-on: macos-13

env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_DISTRIBUTION_CERT_BASE64 }}
Expand All @@ -126,8 +126,8 @@ jobs:
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
# Import certificate and provisioning profile
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode --output $PP_PATH
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode > $CERTIFICATE_PATH
echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode > $PP_PATH
# Create temporary keychain
security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
Expand All @@ -146,7 +146,7 @@ jobs:
run: |
# Set path to and import ExportOptions.plist
EXPORTOPTIONS_PATH=$RUNNER_TEMP/ExportOptions.plist
echo -n "$BUILD_EXPORTOPTIONS_BASE64" | base64 --decode --output $EXPORTOPTIONS_PATH
echo -n "$BUILD_EXPORTOPTIONS_BASE64" | base64 --decode > $EXPORTOPTIONS_PATH
# Build IPA
flutter build ipa \
Expand Down
1 change: 1 addition & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ linter:
use_setters_to_change_properties: true
no_leading_underscores_for_local_identifiers: true
always_declare_return_types: true
dangling_library_doc_comments: false
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '11.0'
platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
23 changes: 15 additions & 8 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ PODS:
- Flutter
- geolocator_apple (1.2.0):
- Flutter
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
Expand All @@ -20,7 +23,8 @@ DEPENDENCIES:
- flutter_sensors (from `.symlinks/plugins/flutter_sensors/ios`)
- flutter_web_auth (from `.symlinks/plugins/flutter_web_auth/ios`)
- geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

EXTERNAL SOURCES:
Expand All @@ -34,20 +38,23 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_web_auth/ios"
geolocator_apple:
:path: ".symlinks/plugins/geolocator_apple/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/ios"
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"

SPEC CHECKSUMS:
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
flutter_sensors: dc6eed3291e7724bf8f4138d7d14c4071b42bd29
flutter_web_auth: c25208760459cec375a3c39f6a8759165ca0fa4d
geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586

PODFILE CHECKSUM: 642e1262a59f7238a9b65ccfac5b00f35ff92053
PODFILE CHECKSUM: 0e7df49a070ca6a0600383e3ff3158cb74cc9dbf

COCOAPODS: 1.12.0
COCOAPODS: 1.14.3
3 changes: 2 additions & 1 deletion ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -208,6 +208,7 @@
files = (
);
inputPaths = (
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
1 change: 1 addition & 0 deletions lib/commons/country_language_map.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/// GROUP BY ?ISO_Country
/// ORDER BY (?ISO_Country)
/// ```
library;

const countryToLanguageMapping = {
'AD': {'ca'},
Expand Down
12 changes: 6 additions & 6 deletions lib/commons/routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ abstract class WidgetPageRoute<T> extends PageRoute<T> {
Widget get page;

WidgetPageRoute({
RouteSettings? settings,
bool fullscreenDialog = false
}): super(settings: settings, fullscreenDialog: fullscreenDialog);
super.settings,
super.fullscreenDialog
});
}


Expand All @@ -55,9 +55,9 @@ class SlideInOutPageRoute<T> extends WidgetPageRoute<T> {
final Widget page;

SlideInOutPageRoute(this.page, {
RouteSettings? settings,
bool fullscreenDialog = false,
}) : super(settings: settings, fullscreenDialog: fullscreenDialog);
super.settings,
super.fullscreenDialog,
});

@override
Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) {
Expand Down
2 changes: 1 addition & 1 deletion lib/models/element_variants/processed_element.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ abstract class ProcessedElement<T extends osmapi.OSMElement, G extends Geographi
final _parents = HashSet<ParentElement>();
final _children = HashSet<ChildElement>();

ProcessedElement(T osmElement): super(osmElement);
ProcessedElement(super.osmElement);

G get geometry {
if (_geometry == null) {
Expand Down
6 changes: 3 additions & 3 deletions lib/models/stop_area_processing/stop_area.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ class StopArea extends Circle {

StopArea(
Iterable<Stop> stops,
LatLng center,
double radius,
) : stops = Set.unmodifiable(stops), super(center, radius);
super.center,
super.radius,
) : stops = Set.unmodifiable(stops);

double get diameter => radius + radius;

Expand Down
2 changes: 1 addition & 1 deletion lib/screens/help.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import '/commons/app_config.dart' as app_config;
import '/commons/routes.dart';

class HelpScreen extends StatelessWidget {
const HelpScreen({Key? key}) : super(key: key);
const HelpScreen({super.key});

static final _urlIssues = Uri.parse('${app_config.appProjectUrl}/issues');
static final _urlTranslation = Uri.parse('https://hosted.weblate.org/engage/openstop/');
Expand Down
4 changes: 2 additions & 2 deletions lib/screens/onboarding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ class OnboardingPage extends StatelessWidget {
this.buttonText,
this.buttonIcon = Icons.chevron_right,
this.onButtonTap,
Key? key
}) : super(key: key);
super.key
});

@override
Widget build(BuildContext context) {
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/cell_cache.dart
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ class CellCache<T> {
/// An index the [CellCache] represented by two integer values x and y
class CellIndex extends Point<int> {
CellIndex(x, y) : super(x, y);
CellIndex(super.x, super.y);
}
4 changes: 2 additions & 2 deletions lib/utils/map_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ extension AnimationUtils on MapController {
class LatLngTween extends Tween<LatLng> {
static const piDoubled = pi * 2;

LatLngTween({ LatLng? begin, LatLng? end }) : super(begin: begin, end: end);
LatLngTween({ super.begin, super.end });

@override
LatLng lerp(double t) {
Expand All @@ -107,7 +107,7 @@ class LatLngTween extends Tween<LatLng> {
/// Interpolate radians values in the direction of the shortest rotation delta / rotation angle.
class RotationTween extends Tween<double> {
RotationTween({ double? begin, double? end }) : super(begin: begin, end: end);
RotationTween({ super.begin, super.end });

@override
double lerp(double t) {
Expand Down
8 changes: 4 additions & 4 deletions lib/widgets/custom_list_tile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class CustomListTile extends StatelessWidget {
this.trailingIcon,
this.onTap,
this.isThreeLine = false,
Key? key
}) : super(key: key);
super.key
});


@override
Expand Down Expand Up @@ -60,8 +60,8 @@ class CustomSwitchListTile extends StatelessWidget {
this.leadingIcon,
this.onChanged,
this.isThreeLine = false,
Key? key
}) : super(key: key);
super.key
});


@override
Expand Down
3 changes: 1 addition & 2 deletions lib/widgets/custom_snackbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class CustomSnackBar extends SnackBar{
CustomSnackBar(String text, {
String? actionText,
VoidCallback? actionCallback,
Key? key,
super.key,
}) : super(
content: Text(text),
action: actionText != null && actionCallback != null
Expand All @@ -21,7 +21,6 @@ class CustomSnackBar extends SnackBar{
behavior: SnackBarBehavior.floating,
margin: const EdgeInsets.only(left: 20, right: 20, bottom: 20),
dismissDirection: DismissDirection.none,
key: key,

);
}
4 changes: 2 additions & 2 deletions lib/widgets/dots_indicator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ class DotsIndicator extends AnimatedWidget {
required this.itemCount,
required this.onPageSelected,
this.color = Colors.black54,
Key? key
}) : super(key: key, listenable: controller);
super.key
}) : super(listenable: controller);

/// The PageController that this DotsIndicator is representing.
final PageController controller;
Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/geometry_layer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class GeometryLayer extends StatelessWidget {

const GeometryLayer({
required this.geometry,
Key? key,
}) : super(key: key);
super.key,
});

@override
Widget build(BuildContext context) {
Expand Down
9 changes: 4 additions & 5 deletions lib/widgets/hero_viewer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ class HeroViewer extends StatefulWidget {
this.routeTransitionsBuilder = HeroViewer.defaultRouteTransitionsBuilder,
this.routeTransitionDuration = const Duration(milliseconds: 300),
this.tag,
Key? key,
}) : super(key: key);
super.key,
});

@override
State<HeroViewer> createState() => _HeroViewerState();
Expand Down Expand Up @@ -174,9 +174,8 @@ class _HeroViewerPage extends StatelessWidget {
required this.child,
required this.builder,
required this.tag,
required this.trigger,
Key? key,
}) : super(key: key);
required this.trigger
});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/map_overlay/compass_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class CompassButton extends StatelessWidget {
required this.rotation,
required this.onPressed,
this.isDegree = false,
Key? key
}) : super(key: key);
super.key
});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/map_overlay/credit_text.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class CreditText extends StatefulWidget {
this.separatorBuilder = _defaultSeparatorBuilder,
this.alignment = TextAlign.center,
this.padding = EdgeInsets.zero,
Key? key
}) : super(key: key);
super.key
});

@override
State<CreditText> createState() => _CreditTextState();
Expand Down
8 changes: 4 additions & 4 deletions lib/widgets/map_overlay/location_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ class LocationButton extends ImplicitlyAnimatedWidget {
final Color? color, activeColor, iconColor, activeIconColor;

const LocationButton({
Key? key,
super.key,
this.active = false,
this.onPressed,
this.color = Colors.white,
this.activeColor = Colors.black,
this.iconColor = Colors.black,
this.activeIconColor = Colors.white,
Duration duration = const Duration(milliseconds: 300),
Curve curve = Curves.ease,
}) : super(key: key, duration: duration, curve: curve);
super.duration = const Duration(milliseconds: 300),
super.curve = Curves.ease,
});


@override
Expand Down
6 changes: 3 additions & 3 deletions lib/widgets/map_overlay/map_overlay.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ class MapOverlay extends ViewFragment<HomeViewModel> {
final double buttonSpacing;

const MapOverlay({
Key? key,
super.key,
this.buttonSpacing = 10.0,
}) : super(key: key);
});

@override
Widget build(BuildContext context, viewModel) {
Expand Down Expand Up @@ -82,7 +82,7 @@ class MapOverlay extends ViewFragment<HomeViewModel> {
color: Theme.of(context).colorScheme.primaryContainer,
iconColor: Theme.of(context).colorScheme.onPrimaryContainer,
active: viewModel.cameraIsFollowingLocation,
onPressed: viewModel.toggleLocationFollowing,
onPressed: viewModel.toggleLocationFollowing.call,
),
SizedBox (
height: buttonSpacing,
Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/map_overlay/zoom_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ class ZoomButton extends StatelessWidget {
final void Function()? onZoomOutPressed;

const ZoomButton({
Key? key,
super.key,
this.onZoomInPressed,
this.onZoomOutPressed,
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/osm_element_layer/osm_element_layer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ class OsmElementLayer extends StatefulWidget {
this.durationOffsetRange = const Duration(milliseconds: 300),
// TODO: currently changes to this won't update the super cluster
this.zoomLowerLimit = 16,
Key? key
}) : super(key: key);
super.key
});

@override
State<OsmElementLayer> createState() => _OsmElementLayerState();
Expand Down
Loading

0 comments on commit 31ba269

Please sign in to comment.