Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Flutter SDK and Android build dependencies to latest versions #2722

Merged
Merged
Show file tree
Hide file tree
Changes from 4 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
21 changes: 10 additions & 11 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name: PR Workflow
on:
pull_request:
branches-ignore:
- 'master'
- "master"

env:
CODECOV_UNIQUE_NAME: CODECOV_UNIQUE_NAME-${{ github.run_id }}-${{ github.run_number }}
Expand All @@ -33,12 +33,12 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17.0'
distribution: "zulu" # See 'Supported distributions' for available options
java-version: "17.0"
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.22.3'
channel: 'stable' # or: 'beta', 'dev' or 'master'
flutter-version: "3.27.3"
channel: "stable" # or: 'beta', 'dev' or 'master'
- name: Set default branch.
run: git remote set-head origin --auto
shell: bash
Expand Down Expand Up @@ -94,7 +94,6 @@ jobs:
echo "Error: Close this PR and try again."
exit 1


Branch-check:
if: ${{ github.actor != 'dependabot[bot]' && !contains(github.event.pull_request.labels.*.name, 'ignore-sensitive-files-pr') }}
name: "Base branch check"
Expand Down Expand Up @@ -185,7 +184,7 @@ jobs:
java-version: "17.0"
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.3"
flutter-version: "3.27.3"
channel: "stable" # or: 'beta', 'dev' or 'master'
- name: Running pub get to fetch dependencies
run: flutter pub get
Expand Down Expand Up @@ -216,7 +215,7 @@ jobs:
java-version: "17.0"
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.3"
flutter-version: "3.27.3"
channel: "stable" # or: 'beta', 'dev' or 'master'
- name: Running pub get to fetch dependencies
run: flutter pub get
Expand All @@ -231,7 +230,7 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.3"
flutter-version: "3.27.3"
channel: "stable" # or: 'beta', 'dev' or 'master'
architecture: x64
- name: Building for ios
Expand All @@ -241,15 +240,15 @@ jobs:
name: Test Deployment to https://docs-mobile.talawa.io
runs-on: ubuntu-latest
needs: [iOS-Build, Android-Build]
# Run only if the develop-postgres branch and not dependabot
# Run only if the develop-postgres branch and not dependabot
if: ${{ github.actor != 'dependabot[bot]' && github.event.pull_request.base.ref == 'develop-postgres' }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 22
cache: yarn
cache-dependency-path: 'docs/'
cache-dependency-path: "docs/"
# Run Docusaurus in the ./docs directory
- name: Install dependencies
working-directory: ./docs
Expand Down
35 changes: 16 additions & 19 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name: PUSH Workflow
on:
push:
branches-ignore:
- 'master'
- "master"

tags:
- "*"
Expand All @@ -22,7 +22,6 @@ env:
CODECOV_UNIQUE_NAME: CODECOV_UNIQUE_NAME-${{ github.run_id }}-${{ github.run_number }}

jobs:

Flutter-Codebase-Check:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Checking Codebase
Expand All @@ -36,12 +35,12 @@ jobs:
fetch-depth: 0
- uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17.0'
distribution: "zulu" # See 'Supported distributions' for available options
java-version: "17.0"
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.22.3'
channel: 'stable' # or: 'beta', 'dev' or 'master'
flutter-version: "3.27.3"
channel: "stable" # or: 'beta', 'dev' or 'master'
- name: Running pub get in talawa_lint
run: cd talawa_lint && flutter pub get && cd ..
- name: Running pub get to fetch dependencies
Expand Down Expand Up @@ -70,7 +69,6 @@ jobs:
# - name: Echo the GitHub context for troubleshooting
# run: echo "${{ toJSON(github) }}"


Flutter-Testing:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Testing codebase
Expand All @@ -81,12 +79,12 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17.0'
distribution: "zulu" # See 'Supported distributions' for available options
java-version: "17.0"
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.22.3'
channel: 'stable' # or: 'beta', 'dev' or 'master'
flutter-version: "3.27.3"
channel: "stable" # or: 'beta', 'dev' or 'master'
- name: Running pub get in talawa_lint
run: cd talawa_lint && flutter pub get && cd ..
- name: Running pub get to fetch dependencies
Expand All @@ -99,7 +97,7 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true
fail_ci_if_error: false
name: '${{env.CODECOV_UNIQUE_NAME}}'
name: "${{env.CODECOV_UNIQUE_NAME}}"

Android-Build-and-Release:
if: ${{ github.actor != 'dependabot[bot]' }}
Expand All @@ -113,12 +111,12 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17.0'
distribution: "zulu" # See 'Supported distributions' for available options
java-version: "17.0"
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.22.3'
channel: 'stable' # or: 'beta', 'dev' or 'master'
flutter-version: "3.27.3"
channel: "stable" # or: 'beta', 'dev' or 'master'
- name: Running pub get in talawa_lint
run: cd talawa_lint && flutter pub get && cd ..
- name: Running pub get to fetch dependencies
Expand Down Expand Up @@ -150,8 +148,8 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.22.3'
channel: 'stable' # or: 'beta', 'dev' or 'master'
flutter-version: "3.27.3"
channel: "stable" # or: 'beta', 'dev' or 'master'
architecture: x64
- name: Building for ios
run: flutter build ios --release --no-codesign
Expand All @@ -161,7 +159,6 @@ jobs:
########################################################
## Package the app as an .ipa and create a release ##
########################################################

- name: Releasing for iOS
run: |
mkdir Payload
Expand Down
2 changes: 2 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
coreLibraryDesugaringEnabled true
}

kotlinOptions {
Expand All @@ -75,4 +76,5 @@ flutter {
dependencies {
implementation 'com.android.support:multidex:1.0.3'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10"
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
}
9 changes: 9 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ allprojects {

rootProject.buildDir = '../build'
subprojects {
afterEvaluate { project ->
if (project.hasProperty('android')) {
project.android {
if (namespace == null) {
namespace project.group
}
}
}
}
project.buildDir = "${rootProject.buildDir}/${project.name}"
project.evaluationDependsOn(':app')
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.2"
id "com.android.application" version '7.3.0' apply false
id "com.android.application" version '8.7.1' apply false
id "org.jetbrains.kotlin.android" version "1.8.10" apply false
id("com.google.gms.google-services") version "4.4.1" apply false

Expand Down
2 changes: 1 addition & 1 deletion lib/custom_painters/language_icon.dart
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ class LanguageIcon extends CustomPainter {
path_0.close();

final Paint paint0fill = Paint()..style = PaintingStyle.fill;
paint0fill.color = const Color(0xff737373).withOpacity(1.0);
paint0fill.color = const Color(0xff737373).withAlpha((1.0 * 255).toInt());
canvas.drawPath(path_0, paint0fill);
}

Expand Down
8 changes: 4 additions & 4 deletions lib/custom_painters/talawa_logo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class AppLogo extends CustomPainter {
path_0.close();

final Paint paint0fill = Paint()..style = PaintingStyle.fill;
paint0fill.color = const Color(0xff31BB6B).withOpacity(1.0);
paint0fill.color = const Color(0xff31BB6B).withAlpha((1.0 * 255).toInt());
canvas.drawPath(path_0, paint0fill);

final Path path_1 = Path();
Expand Down Expand Up @@ -270,7 +270,7 @@ class AppLogo extends CustomPainter {
path_1.close();

final Paint paint1fill = Paint()..style = PaintingStyle.fill;
paint1fill.color = const Color(0xffFEBC59).withOpacity(1.0);
paint1fill.color = const Color(0xffFEBC59).withAlpha((1.0 * 255).toInt());
canvas.drawPath(path_1, paint1fill);

final Path path_2 = Path();
Expand Down Expand Up @@ -342,7 +342,7 @@ class AppLogo extends CustomPainter {
path_2.close();

final Paint paint2fill = Paint()..style = PaintingStyle.fill;
paint2fill.color = const Color(0xff737373).withOpacity(1.0);
paint2fill.color = const Color(0xff737373).withAlpha((1.0 * 255).toInt());
canvas.drawPath(path_2, paint2fill);

final Path path_3 = Path();
Expand Down Expand Up @@ -422,7 +422,7 @@ class AppLogo extends CustomPainter {
path_3.close();

final Paint paint3fill = Paint()..style = PaintingStyle.fill;
paint3fill.color = const Color(0xff737373).withOpacity(1.0);
paint3fill.color = const Color(0xff737373).withAlpha((1.0 * 255).toInt());
canvas.drawPath(path_3, paint3fill);
}

Expand Down
12 changes: 6 additions & 6 deletions lib/custom_painters/telegram_logo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class TelegramLogo extends CustomPainter {
paint0Fill.shader = ui.Gradient.linear(
Offset(size.width * 0.6670000, size.height * 0.1670000),
Offset(size.width * 0.4170000, size.height * 0.7500000), [
const Color(0xff37aee2).withOpacity(1),
const Color(0xff1e96c8).withOpacity(1),
const Color(0xff37aee2).withAlpha((1.0 * 255).toInt()),
const Color(0xff1e96c8).withAlpha((1.0 * 255).toInt()),
], [
0,
1,
Expand All @@ -43,7 +43,7 @@ class TelegramLogo extends CustomPainter {
path_1.lineTo(size.width * 0.7083333, size.height * 0.3333333);

final Paint paint1Fill = Paint()..style = PaintingStyle.fill;
paint1Fill.color = const Color(0xffc8daea).withOpacity(1.0);
paint1Fill.color = const Color(0xffc8daea).withAlpha((1.0 * 255).toInt());
canvas.drawPath(path_1, paint1Fill);

final Path path_2 = Path();
Expand All @@ -60,7 +60,7 @@ class TelegramLogo extends CustomPainter {
path_2.lineTo(size.width * 0.4168417, size.height * 0.6016958);

final Paint paint2Fill = Paint()..style = PaintingStyle.fill;
paint2Fill.color = const Color(0xffa9c9dd).withOpacity(1.0);
paint2Fill.color = const Color(0xffa9c9dd).withAlpha((1.0 * 255).toInt());
canvas.drawPath(path_2, paint2Fill);

final Path path_3 = Path();
Expand Down Expand Up @@ -107,8 +107,8 @@ class TelegramLogo extends CustomPainter {
paint3Fill.shader = ui.Gradient.linear(
Offset(size.width * 0.6600000, size.height * 0.4370000),
Offset(size.width * 0.8510000, size.height * 0.8020000), [
const Color(0xffeff7fc).withOpacity(1),
const Color(0xffffffff).withOpacity(1),
const Color(0xffeff7fc).withAlpha((1.0 * 255).toInt()),
const Color(0xffffffff).withAlpha((1.0 * 255).toInt()),
], [
0,
1,
Expand Down
4 changes: 2 additions & 2 deletions lib/custom_painters/whatsapp_logo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class WhatsappLogo extends CustomPainter {
);

final Paint paint0Fill = Paint()..style = PaintingStyle.fill;
paint0Fill.color = const Color(0xff40c351).withOpacity(1.0);
paint0Fill.color = const Color(0xff40c351).withAlpha((1.0 * 255).toInt());
canvas.drawPath(path_0, paint0Fill);

final Path path_1 = Path();
Expand Down Expand Up @@ -422,7 +422,7 @@ class WhatsappLogo extends CustomPainter {
path_1.close();

final Paint paint1fill = Paint()..style = PaintingStyle.fill;
paint1fill.color = const Color(0xfffcfcfc).withOpacity(1.0);
paint1fill.color = const Color(0xfffcfcfc).withAlpha((1.0 * 255).toInt());
canvas.drawPath(path_1, paint1fill);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/services/navigation_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class NavigationService {
Icons.error_outline,
color: Colors.redAccent,
),
color: Colors.black.withOpacity(0.8),
color: Colors.black.withAlpha((1.0 * 255).toInt()),
);
},
).show(navigatorKey.currentContext!);
Expand Down
2 changes: 1 addition & 1 deletion lib/view_model/access_request_view_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class AccessScreenViewModel extends BaseModel {
);
if (result.data != null) {
final OrgInfo membershipRequest = OrgInfo.fromJson(
((result.data!)['sendMembershipRequest']
(result.data!['sendMembershipRequest']
as Map<String, dynamic>)['organization'] as Map<String, dynamic>,
);
userConfig.updateUserMemberRequestOrg([membershipRequest]);
Expand Down
4 changes: 2 additions & 2 deletions lib/view_model/main_screen_view_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class MainScreenViewModel extends BaseModel {
currentPageIndex = mainScreenIndex;
showAppTour = fromSignUp || demoMode;
context = ctx;

final appTourDialogWidget = appTourDialog(ctx);
print(ctx);
print(context);
may-tas marked this conversation as resolved.
Show resolved Hide resolved
pluginPrototypeData = {
Expand All @@ -196,7 +196,7 @@ class MainScreenViewModel extends BaseModel {
Future.delayed(
const Duration(seconds: 1),
() => navigationService.pushDialog(
appTourDialog(ctx),
appTourDialogWidget,
),
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class _ChatInputFieldState extends State<ChatInputField> {
BoxShadow(
offset: const Offset(0, 4),
blurRadius: 32,
color: const Color(0xFF087949).withOpacity(0.08),
color: const Color(0xFF087949).withAlpha((0.08 * 255).toInt()),
),
],
),
Expand Down Expand Up @@ -94,7 +94,7 @@ class _ChatInputFieldState extends State<ChatInputField> {
.textTheme
.bodyLarge!
.color!
.withOpacity(0.64),
.withAlpha((0.64 * 255).toInt()),
),
),
// Placeholder text for the text field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class _EditAgendaItemPageState extends State<EditAgendaItemPage> {
Icons.error_outline,
color: Colors.redAccent,
),
color: Colors.black.withOpacity(0.8),
color: Colors.black.withAlpha((0.8 * 255).toInt()),
);
},
).show(context);
Expand Down
Loading
Loading