Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
workflow_dispatch:

env:
flutter_version: '3.24.3'
java_version: '11'
flutter_version: '3.35.2'
java_version: '17'

jobs:
version:
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: ${{ env.java_version}}
cache: 'gradle'
- uses: subosito/flutter-action@v2
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@ on:
workflow_dispatch:

env:
flutter_version: '3.24.3'
java_version: '11'
flutter_version: '3.35.2'
java_version: '17'

jobs:
format:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- name: Cache Flutter installation
- name: "Checkout repository code ⤵️"
uses: actions/checkout@v3
- name: "Cache Flutter installation 💾"
uses: actions/cache@v3
with:
path: /opt/hostedtoolcache/flutter
Expand All @@ -38,10 +39,9 @@ jobs:
restore-keys: |
${{ runner.os }}-pub-cache-
- run: flutter config --no-analytics
- run: flutter pub get
- name: Format code
run: dart format . --set-exit-if-changed
- name: Install dependencies
run: flutter pub get
test:
runs-on: ubuntu-latest
steps:
Expand Down
93 changes: 52 additions & 41 deletions android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,40 @@ GEM
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.981.0)
aws-sdk-core (3.209.1)
aws-eventstream (1.4.0)
aws-partitions (1.1153.0)
aws-sdk-core (3.232.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
bigdecimal
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.94.0)
aws-sdk-core (~> 3, >= 3.207.0)
logger
aws-sdk-kms (1.112.0)
aws-sdk-core (~> 3, >= 3.231.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.166.0)
aws-sdk-core (~> 3, >= 3.207.0)
aws-sdk-s3 (1.198.0)
aws-sdk-core (~> 3, >= 3.231.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.10.0)
aws-sigv4 (1.12.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
base64 (0.3.0)
bigdecimal (3.2.2)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
digest-crc (0.6.5)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.111.0)
excon (0.112.0)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand All @@ -55,20 +59,20 @@ GEM
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-em_synchrony (1.0.1)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-multipart (1.1.1)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.223.1)
fastimage (2.4.0)
fastlane (2.228.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand All @@ -84,6 +88,7 @@ GEM
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
Expand All @@ -107,8 +112,10 @@ GEM
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty (~> 0.4.1)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
Expand All @@ -126,12 +133,12 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.7.1)
google-cloud-core (1.8.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.4.0)
google-cloud-errors (1.5.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
Expand All @@ -147,43 +154,47 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.7)
http-cookie (1.0.8)
domain_name (~> 0.5)
httpclient (2.8.3)
httpclient (2.9.0)
mutex_m
jmespath (1.6.2)
json (2.7.2)
jwt (2.9.1)
json (2.13.2)
jwt (2.10.2)
base64
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multi_json (1.17.0)
multipart-post (2.4.1)
nanaimo (0.3.0)
naturally (2.2.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
naturally (2.3.0)
nkf (0.2.0)
optparse (0.5.0)
optparse (0.6.0)
os (1.1.4)
plist (3.7.1)
public_suffix (6.0.1)
rake (13.2.1)
plist (3.7.2)
public_suffix (6.0.2)
rake (13.3.0)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.3.8)
rouge (2.0.7)
rexml (3.4.2)
rouge (3.28.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
rubyzip (2.4.1)
security (0.1.5)
signet (0.19.0)
signet (0.21.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
jwt (>= 1.5, < 4.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand All @@ -195,15 +206,15 @@ GEM
uber (0.1.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.25.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (>= 3.3.2, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.4.1)
rouge (~> 3.28.0)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)

Expand Down
11 changes: 8 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,23 @@ def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}

android {
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
jvmTarget = JavaVersion.VERSION_17
}

sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 28 14:58:51 CET 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
4 changes: 2 additions & 2 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.1.0" apply false
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
id "com.android.application" version "8.12.2" apply false
id "org.jetbrains.kotlin.android" version "2.2.10" apply false
}

include ":app"
2 changes: 1 addition & 1 deletion integration_test/common.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Future<void> createApp(WidgetTester widgetTester,
});
return appDatabase;
}),
isPremiumProvider.overrideWith((ref) => true),
isPremiumProvider.overrideWithBuild((_, __) => true),
showAdsProvider.overrideWith((ref) => ShowAds.hide),
bannerAdsProvider.overrideWith((ref, arg) => Future.error('')),
],
Expand Down
1 change: 1 addition & 0 deletions ios/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Flutter/app.flx
Flutter/app.zip
Flutter/flutter_assets/
Flutter/flutter_export_environment.sh
Flutter/ephemeral/
ServiceDefinitions.json
Runner/GeneratedPluginRegistrant.*
build/ios/Pods.build/
Expand Down
13 changes: 8 additions & 5 deletions lib/common/presentation/clean_players_view_model.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:tagros_comptes/tagros/data/source/db/app_database.dart';
import 'package:tagros_comptes/tagros/data/source/db/db_providers.dart';

class CleanPlayer extends AutoDisposeNotifier<Stream<List<Player>>> {
class CleanPlayer extends Notifier<Stream<List<Player>>> {
@override
Stream<List<Player>> build() {
return ref.read(playerDaoProvider).unusedPlayers().watch();
Expand All @@ -18,6 +18,9 @@ class CleanPlayer extends AutoDisposeNotifier<Stream<List<Player>>> {
}

final cleanPlayerProvider =
NotifierProvider.autoDispose<CleanPlayer, Stream<List<Player>>>(() {
return CleanPlayer();
});
NotifierProvider.autoDispose<CleanPlayer, Stream<List<Player>>>(
() {
return CleanPlayer();
},
dependencies: [playerDaoProvider],
);
2 changes: 1 addition & 1 deletion lib/common/presentation/component/background_gradient.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class BackgroundGradient extends ConsumerWidget {
data: (data) => data.backgroundGradient2,
orElse: () => Colors.transparent,
)));
if (bgGradient1.opacity == 0 && bgGradient2.opacity == 0) {
if (bgGradient1.a == 0 && bgGradient2.a == 0) {
return child;
}
return DecoratedBox(
Expand Down
2 changes: 1 addition & 1 deletion lib/common/presentation/component/message_inline.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ErrorInline extends StatelessWidget {
child: Ink(
width: double.infinity,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.error.withOpacity(0.9),
color: Theme.of(context).colorScheme.error.withValues(alpha: 0.9),
borderRadius: BorderRadius.circular(10),
),
child: Padding(
Expand Down
2 changes: 1 addition & 1 deletion lib/common/presentation/component/support_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class SupportWidget extends StatelessWidget {
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Colors.white.withOpacity(0.5),
color: Colors.white.withValues(alpha: 0.5),
spreadRadius: 1,
blurRadius: 10,
offset: const Offset(0, -3)),
Expand Down
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class MyApp extends HookConsumerWidget {
],
supportedLocales: S.delegate.supportedLocales,
locale: locale,
theme: ref.watch(themeDataProvider).valueOrNull,
theme: ref.watch(themeDataProvider).value,
);
}
}
Loading