Upgraded gradle version and configuration files
This commit is contained in:
		
							
								
								
									
										34
									
								
								.metadata
									
									
									
									
									
								
							
							
						
						
									
										34
									
								
								.metadata
									
									
									
									
									
								
							| @@ -1,11 +1,11 @@ | ||||
| # This file tracks properties of this Flutter project. | ||||
| # Used by Flutter tool to assess capabilities and perform upgrades etc. | ||||
| # | ||||
| # This file should be version controlled. | ||||
| # This file should be version controlled and should not be manually edited. | ||||
|  | ||||
| version: | ||||
|   revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|   channel: stable | ||||
|   revision: "ba393198430278b6595976de84fe170f553cc728" | ||||
|   channel: "stable" | ||||
|  | ||||
| project_type: app | ||||
|  | ||||
| @@ -13,26 +13,26 @@ project_type: app | ||||
| migration: | ||||
|   platforms: | ||||
|     - platform: root | ||||
|       create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       create_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|       base_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|     - platform: android | ||||
|       create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       create_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|       base_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|     - platform: ios | ||||
|       create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       create_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|       base_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|     - platform: linux | ||||
|       create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       create_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|       base_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|     - platform: macos | ||||
|       create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       create_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|       base_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|     - platform: web | ||||
|       create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       create_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|       base_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|     - platform: windows | ||||
|       create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 | ||||
|       create_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|       base_revision: ba393198430278b6595976de84fe170f553cc728 | ||||
|  | ||||
|   # User provided section | ||||
|  | ||||
|   | ||||
| @@ -1,3 +1,9 @@ | ||||
| plugins { | ||||
|     id "com.android.application" | ||||
|     id "kotlin-android" | ||||
|     id "dev.flutter.flutter-gradle-plugin" | ||||
| } | ||||
|  | ||||
| def localProperties = new Properties() | ||||
| def localPropertiesFile = rootProject.file('local.properties') | ||||
| if (localPropertiesFile.exists()) { | ||||
| @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { | ||||
|     } | ||||
| } | ||||
|  | ||||
| def flutterRoot = localProperties.getProperty('flutter.sdk') | ||||
| if (flutterRoot == null) { | ||||
|     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") | ||||
| } | ||||
|  | ||||
| def flutterVersionCode = localProperties.getProperty('flutter.versionCode') | ||||
| if (flutterVersionCode == null) { | ||||
|     flutterVersionCode = '1' | ||||
| @@ -21,13 +22,9 @@ if (flutterVersionName == null) { | ||||
|     flutterVersionName = '1.0' | ||||
| } | ||||
|  | ||||
| apply plugin: 'com.android.application' | ||||
| apply plugin: 'kotlin-android' | ||||
| apply plugin: 'com.google.gms.google-services' | ||||
| apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" | ||||
|  | ||||
| android { | ||||
|     compileSdkVersion flutter.compileSdkVersion | ||||
|     namespace "eu.mhsl.marianum.mobile.client" | ||||
|     compileSdk flutter.compileSdkVersion | ||||
|     ndkVersion flutter.ndkVersion | ||||
|  | ||||
|     compileOptions { | ||||
| @@ -35,16 +32,23 @@ android { | ||||
|         targetCompatibility JavaVersion.VERSION_1_8 | ||||
|     } | ||||
|  | ||||
|     kotlinOptions { | ||||
|         jvmTarget = '1.8' | ||||
|     } | ||||
|  | ||||
|     sourceSets { | ||||
|         main.java.srcDirs += 'src/main/kotlin' | ||||
|     } | ||||
|  | ||||
|     defaultConfig { | ||||
|         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). | ||||
|         applicationId "eu.mhsl.marianum.mobile.client" | ||||
|         // You can update the following values to match your application needs. | ||||
|         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. | ||||
|         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. | ||||
|         minSdkVersion 19 | ||||
|         targetSdkVersion flutter.targetSdkVersion | ||||
|         versionCode flutterVersionCode.toInteger() | ||||
|         versionName flutterVersionName | ||||
|         multiDexEnabled true | ||||
|     } | ||||
|  | ||||
|     buildTypes { | ||||
| @@ -59,3 +63,5 @@ android { | ||||
| flutter { | ||||
|     source '../..' | ||||
| } | ||||
|  | ||||
| dependencies {} | ||||
|   | ||||
| @@ -1,5 +1,4 @@ | ||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     package="eu.mhsl.marianum.mobile.client"> | ||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||||
|     <!-- The INTERNET permission is required for development. Specifically, | ||||
|          the Flutter tool needs it to communicate with the running application | ||||
|          to allow setting breakpoints, to provide hot reload, etc. | ||||
|   | ||||
| @@ -1,6 +1,5 @@ | ||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     package="eu.mhsl.marianum.mobile.client"> | ||||
|    <application | ||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||||
|     <application | ||||
|         android:label="Marianum Fulda" | ||||
|         android:name="${applicationName}" | ||||
|         android:icon="@mipmap/ic_launcher"> | ||||
| @@ -31,5 +30,16 @@ | ||||
|             android:name="flutterEmbedding" | ||||
|             android:value="2" /> | ||||
|     </application> | ||||
|     <!-- Required to query activities that can process text, see: | ||||
|          https://developer.android.com/training/package-visibility?hl=en and | ||||
|          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT. | ||||
|  | ||||
|          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. --> | ||||
|     <queries> | ||||
|         <intent> | ||||
|             <action android:name="android.intent.action.PROCESS_TEXT"/> | ||||
|             <data android:mimeType="text/plain"/> | ||||
|         </intent> | ||||
|     </queries> | ||||
|     <uses-permission android:name="android.permission.INTERNET"/> | ||||
| </manifest> | ||||
|   | ||||
| @@ -1,6 +0,0 @@ | ||||
| package eu.mhsl.marianum.mobile.client; | ||||
|  | ||||
| import io.flutter.embedding.android.FlutterActivity; | ||||
|  | ||||
| public class MainActivity extends FlutterActivity { | ||||
| } | ||||
| @@ -0,0 +1,5 @@ | ||||
| package com.example.client | ||||
|  | ||||
| import io.flutter.embedding.android.FlutterActivity | ||||
|  | ||||
| class MainActivity: FlutterActivity() | ||||
| @@ -0,0 +1,5 @@ | ||||
| package eu.mhsl.marianum.mobile.client | ||||
|  | ||||
| import io.flutter.embedding.android.FlutterActivity | ||||
|  | ||||
| class MainActivity: FlutterActivity() | ||||
| @@ -1,5 +1,4 @@ | ||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     package="eu.mhsl.marianum.mobile.client"> | ||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||||
|     <!-- The INTERNET permission is required for development. Specifically, | ||||
|          the Flutter tool needs it to communicate with the running application | ||||
|          to allow setting breakpoints, to provide hot reload, etc. | ||||
|   | ||||
| @@ -1,18 +1,3 @@ | ||||
| buildscript { | ||||
|     ext.kotlin_version = '1.8.0' | ||||
|     repositories { | ||||
|         google() | ||||
|         mavenCentral() | ||||
|     } | ||||
|  | ||||
|     dependencies { | ||||
|         classpath 'com.android.tools.build:gradle:7.4.2' | ||||
|         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||||
|         classpath 'com.google.gms:google-services:4.3.15' | ||||
|         classpath 'androidx.multidex:multidex:2.0.1' | ||||
|     } | ||||
| } | ||||
|  | ||||
| allprojects { | ||||
|     repositories { | ||||
|         google() | ||||
|   | ||||
| @@ -1,3 +1,3 @@ | ||||
| org.gradle.jvmargs=-Xmx1536M | ||||
| org.gradle.jvmargs=-Xmx4G | ||||
| android.useAndroidX=true | ||||
| android.enableJetifier=true | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| #Wed Oct 18 21:35:48 CEST 2023 | ||||
| distributionBase=GRADLE_USER_HOME | ||||
| distributionPath=wrapper/dists | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip | ||||
| networkTimeout=10000 | ||||
| zipStoreBase=GRADLE_USER_HOME | ||||
| zipStorePath=wrapper/dists | ||||
|   | ||||
| @@ -1,11 +1,26 @@ | ||||
| include ':app' | ||||
| pluginManagement { | ||||
|     def flutterSdkPath = { | ||||
|         def properties = new Properties() | ||||
|         file("local.properties").withInputStream { properties.load(it) } | ||||
|         def flutterSdkPath = properties.getProperty("flutter.sdk") | ||||
|         assert flutterSdkPath != null, "flutter.sdk not set in local.properties" | ||||
|         return flutterSdkPath | ||||
|     } | ||||
|     settings.ext.flutterSdkPath = flutterSdkPath() | ||||
|  | ||||
| def localPropertiesFile = new File(rootProject.projectDir, "local.properties") | ||||
| def properties = new Properties() | ||||
|     includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") | ||||
|  | ||||
| assert localPropertiesFile.exists() | ||||
| localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } | ||||
|     repositories { | ||||
|         google() | ||||
|         mavenCentral() | ||||
|         gradlePluginPortal() | ||||
|     } | ||||
| } | ||||
|  | ||||
| def flutterSdkPath = properties.getProperty("flutter.sdk") | ||||
| assert flutterSdkPath != null, "flutter.sdk not set in local.properties" | ||||
| apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" | ||||
| plugins { | ||||
|     id "dev.flutter.flutter-plugin-loader" version "1.0.0" | ||||
|     id "com.android.application" version "7.3.0" apply false | ||||
|     id "org.jetbrains.kotlin.android" version "1.7.10" apply false | ||||
| } | ||||
|  | ||||
| include ":app" | ||||
|   | ||||
							
								
								
									
										12
									
								
								ios/RunnerTests/RunnerTests.swift
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								ios/RunnerTests/RunnerTests.swift
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| import Flutter | ||||
| import UIKit | ||||
| import XCTest | ||||
|  | ||||
| class RunnerTests: XCTestCase { | ||||
|  | ||||
|   func testExample() { | ||||
|     // If you add code to the Runner application, consider adding tests here. | ||||
|     // See https://developer.apple.com/documentation/xctest for more information about using XCTest. | ||||
|   } | ||||
|  | ||||
| } | ||||
							
								
								
									
										12
									
								
								macos/RunnerTests/RunnerTests.swift
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								macos/RunnerTests/RunnerTests.swift
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| import FlutterMacOS | ||||
| import Cocoa | ||||
| import XCTest | ||||
|  | ||||
| class RunnerTests: XCTestCase { | ||||
|  | ||||
|   func testExample() { | ||||
|     // If you add code to the Runner application, consider adding tests here. | ||||
|     // See https://developer.apple.com/documentation/xctest for more information about using XCTest. | ||||
|   } | ||||
|  | ||||
| } | ||||
| @@ -51,6 +51,8 @@ | ||||
|    | ||||
|    | ||||
|    | ||||
|    | ||||
|    | ||||
|   <style id="splash-screen-style"> | ||||
|     html { | ||||
|       height: 100% | ||||
| @@ -128,6 +130,7 @@ | ||||
|    | ||||
|    | ||||
|    | ||||
|    | ||||
|      | ||||
|   <script> | ||||
|     window.addEventListener('load', function(ev) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user