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.

Sign up for GitHub

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

Jump to bottom

Flutter SDK & package version update #33

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Flutter SDK & package version update #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12602a8
Flutter SDK & package version update
swapnil-musale Sep 4, 2023
9f76fb0
Bump Java Version to 17 in workflow
swapnil-musale Sep 4, 2023
e5c155e
remove commented code
swapnil-musale Sep 7, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build_firebase_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
encodedString: ${{ secrets.KEYSTORE }}
- uses: actions/setup-java@v1
with:
java-version: '12.x'
java-version: '17.x'
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
Expand Down
6 changes: 5 additions & 1 deletion android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "com.mutualmobile.praxis_flutter"
compileSdkVersion 33

compileOptions {
Expand All @@ -42,7 +43,6 @@ android {
}

defaultConfig {
applicationId "com.mutualmobile.praxis_flutter"
minSdkVersion 19
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
Expand Down Expand Up @@ -97,6 +97,10 @@ android {
signingConfig signingConfigs.debug
}
}

buildFeatures {
buildConfig true
}
}

flutter {
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.6.10'
ext.kotlin_version = '1.9.0'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:8.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -24,6 +24,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
1 change: 1 addition & 0 deletions android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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-6.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
4 changes: 2 additions & 2 deletions clean_architecture/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: A new Flutter project.
version: 0.0.1

environment:
sdk: ">=2.15.1 <3.0.0"
sdk: '>=3.1.0 <4.0.0'

dependencies:
logging: ^1.0.2
rxdart: ^0.26.0
rxdart: ^0.27.7
7 changes: 5 additions & 2 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -167,7 +167,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -211,10 +211,12 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
Expand Down Expand Up @@ -242,6 +244,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View file
Open in desktop
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 = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 2 additions & 0 deletions ios/Runner/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,7 @@
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
swap-musale marked this conversation as resolved.
Show resolved Hide resolved
</dict>
</plist>
61 changes: 0 additions & 61 deletions lib/gen/assets.gen.dart
View file
Open in desktop

This file was deleted.

13 changes: 10 additions & 3 deletions lib/injection.config.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 15 additions & 7 deletions praxis_data/lib/injection.config.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions praxis_data/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 0.0.1
publish_to: 'none'

environment:
sdk: ">2.15.1 <=3.3.0"
sdk: '>=3.1.0 <4.0.0'
flutter: ">=1.17.0"

dependencies:
Expand All @@ -18,10 +18,10 @@ dependencies:
dio: ^4.0.6
shared_preferences: ^2.0.15
equatable: ^2.0.5
firebase_core: ^1.21.1
firebase_auth: ^3.7.0
firebase_analytics: ^9.3.3
firebase_in_app_messaging: ^0.6.0+23
firebase_core: ^2.15.1
firebase_auth: ^4.9.0
firebase_analytics: ^10.4.5
firebase_in_app_messaging: ^0.7.3+5
google_sign_in: ^5.4.1
praxis_flutter_domain:
path: ../praxis_flutter_domain
Expand Down
2 changes: 1 addition & 1 deletion praxis_flutter_domain/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: A new Flutter project.
version: 0.0.1

environment:
sdk: ">2.15.1 <=3.3.0"
sdk: '>=3.1.0 <4.0.0'

dependencies:
equatable: ^2.0.5
Expand Down
Loading
Loading