mirror of
				https://github.com/inventree/inventree-app.git
				synced 2025-10-31 13:25:40 +00:00 
			
		
		
		
	Update Requirements (#541)
* Update package requiremenst * github workflow updates * ios build updates * Theme adjustments * Further updates * Fix typo * Deprecated imperative apply of Flutter's Gradle plugins Ref: https://docs.flutter.dev/release/breaking-changes/flutter-gradle-plugin-apply * Refactor wedge scanner * Add context checks * Adjust behaviour if testing * Further refactoring * Moar checks * Logic fix * Fix for wedge scanner test * Fix for barcode processing * Fix * Yet another fix
This commit is contained in:
		| @@ -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 FileNotFoundException("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,10 +22,6 @@ if (flutterVersionName == null) { | ||||
|     flutterVersionName = '1.0' | ||||
| } | ||||
|  | ||||
| apply plugin: 'com.android.application' | ||||
| apply plugin: 'kotlin-android' | ||||
| apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" | ||||
|  | ||||
| def keystoreProperties = new Properties() | ||||
| def keystorePropertiesFile = rootProject.file('key.properties') | ||||
| if (keystorePropertiesFile.exists()) { | ||||
| @@ -85,5 +82,4 @@ dependencies { | ||||
|     androidTestImplementation 'com.android.support:multidex:2.0.1' | ||||
|     implementation "androidx.core:core:1.9.0" | ||||
|     implementation 'androidx.appcompat:appcompat:1.6.0' | ||||
|     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" | ||||
| } | ||||
|   | ||||
| @@ -1,17 +1,3 @@ | ||||
| buildscript { | ||||
|  | ||||
|     ext.kotlin_version = '1.8.10' | ||||
|  | ||||
|     repositories { | ||||
|         google() | ||||
|         mavenCentral() | ||||
|     } | ||||
|  | ||||
|     dependencies { | ||||
|         classpath 'com.android.tools.build:gradle:7.4.1' | ||||
|         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||||
|     } | ||||
| } | ||||
|  | ||||
| allprojects { | ||||
|     repositories { | ||||
|   | ||||
| @@ -1,15 +1,25 @@ | ||||
| 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 | ||||
|     }() | ||||
|  | ||||
| def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() | ||||
|     includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") | ||||
|  | ||||
| def plugins = new Properties() | ||||
| def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') | ||||
| if (pluginsFile.exists()) { | ||||
|     pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } | ||||
|     repositories { | ||||
|         google() | ||||
|         mavenCentral() | ||||
|         gradlePluginPortal() | ||||
|     } | ||||
| } | ||||
|  | ||||
| plugins.each { name, path -> | ||||
|     def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() | ||||
|     include ":$name" | ||||
|     project(":$name").projectDir = pluginDirectory | ||||
| plugins { | ||||
|     id "dev.flutter.flutter-plugin-loader" version "1.0.0" | ||||
|     id "com.android.application" version "7.4.1" apply false | ||||
|     id "org.jetbrains.kotlin.android" version "1.8.10" apply false | ||||
| } | ||||
|  | ||||
| include ":app" | ||||
		Reference in New Issue
	
	Block a user