UNOV/manager-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update gradle, kotlin version to match docker build

Browse Source
This commit is contained in:
Thomas Fransolet 2024-06-21 09:47:55 +02:00
parent e5a2d4f06a
commit 5564810e75
7 changed files with 261 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -34,7 +34,7 @@ android {
defaultConfig { defaultConfig {
applicationId "be.mdlf.manager_app" applicationId "be.mdlf.manager_app"
minSdkVersion 16 minSdkVersion flutter.minSdkVersion
targetSdkVersion 30 targetSdkVersion 30
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName

6
android/build.gradle
View File

@ -1,12 +1,12 @@
buildscript { buildscript {
ext.kotlin_version = '1.3.50' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
@ -26,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }
task clean(type: Delete) { tasks.register("clean", Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip

5
lib/Screens/Main/components/body.dart
View File

@ -15,7 +15,6 @@ import 'package:manager_app/constants.dart';
import 'package:manager_app/main.dart'; import 'package:manager_app/main.dart';
import 'package:manager_api_new/api.dart'; import 'package:manager_api_new/api.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:responsive_framework/responsive_breakpoints.dart';
class Body extends StatefulWidget { class Body extends StatefulWidget {
@ -69,7 +68,7 @@ class _BodyState extends State<Body> {
return Background( return Background(
child: Row( child: Row(
children: [ children: [
if(!ResponsiveBreakpoints.of(context).equals(TABLET)) if(true) //!ResponsiveBreakpoints.of(context).equals(TABLET)
// MENU // MENU
Container( Container(
width: size.width * 0.15, width: size.width * 0.15,
@ -185,7 +184,7 @@ class _BodyState extends State<Body> {
), ),
// Main Container // Main Container
Container( Container(
width: !ResponsiveBreakpoints.of(context).equals(TABLET) ? size.width * 0.85 : size.width, width: size.width * 0.85,//!ResponsiveBreakpoints.of(context).equals(TABLET) ? size.width * 0.85 : size.width,
child: Padding( child: Padding(
padding: const EdgeInsets.all(0.0), padding: const EdgeInsets.all(0.0),
child: selectedElement), child: selectedElement),

2
lib/Screens/Main/main_screen.dart
View File

@ -6,7 +6,7 @@ import 'package:manager_app/Screens/Main/components/body.dart';
import 'package:manager_app/app_context.dart'; import 'package:manager_app/app_context.dart';
import 'package:manager_app/constants.dart'; import 'package:manager_app/constants.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:responsive_framework/responsive_breakpoints.dart'; import 'package:responsive_framework/responsive_framework.dart';
class MainScreen extends StatefulWidget { class MainScreen extends StatefulWidget {
MainScreen({Key? key}) : super(key: key); MainScreen({Key? key}) : super(key: key);

460
pubspec.lock
View File

File diff suppressed because it is too large Load Diff

6
pubspec.yaml
View File

@ -65,11 +65,11 @@ dependencies:
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.6 cupertino_icons: ^1.0.6
quill_html_editor: ^2.2.7 quill_html_editor: ^2.2.7
responsive_framework: ^1.1.1 responsive_framework: ^1.4.0
tab_container: ^2.0.0 tab_container: ^2.0.0
flutter_widget_from_html: ^0.10.1 flutter_widget_from_html: ^0.10.1
firebase_storage: ^11.5.6 firebase_storage: ^12.0.1
firebase_core: ^2.24.2 firebase_core: ^3.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test: