mirror of
				https://github.com/inventree/inventree-app.git
				synced 2025-10-30 21:05:42 +00:00 
			
		
		
		
	Updated dependencies (#255)
* Bump android compile and target version, also flutter dependencies and resolve issues * Remove deprecated splashscreen and added support for new Android 12 version. * Updated workflow action versions and flutter sdk * Resolved linting issues * Resolved test binding issues
This commit is contained in:
		| @@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) { | ||||
| } | ||||
|  | ||||
| android { | ||||
|     compileSdkVersion 31 | ||||
|     compileSdkVersion 33 | ||||
|  | ||||
|     sourceSets { | ||||
|         main.java.srcDirs += 'src/main/kotlin' | ||||
| @@ -49,7 +49,7 @@ android { | ||||
|     defaultConfig { | ||||
|         applicationId "inventree.inventree_app" | ||||
|         minSdkVersion 25 | ||||
|         targetSdkVersion 31 | ||||
|         targetSdkVersion 33 | ||||
|         versionCode flutterVersionCode.toInteger() | ||||
|         versionName flutterVersionName | ||||
|         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" | ||||
| @@ -83,7 +83,7 @@ dependencies { | ||||
|     androidTestImplementation 'com.android.support.test:runner:1.0.2' | ||||
|     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' | ||||
|     androidTestImplementation 'com.android.support:multidex:2.0.1' | ||||
|     implementation "androidx.core:core:1.5.0-rc01" | ||||
|     implementation 'androidx.appcompat:appcompat:1.0.0' | ||||
|     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | ||||
|     implementation "androidx.core:core:1.9.0" | ||||
|     implementation 'androidx.appcompat:appcompat:1.6.0' | ||||
|     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" | ||||
| } | ||||
|   | ||||
| @@ -31,10 +31,6 @@ | ||||
|             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" | ||||
|             android:hardwareAccelerated="true" | ||||
|             android:windowSoftInputMode="adjustResize"> | ||||
|             <!-- until Flutter renders its first frame. --> | ||||
|             <meta-data | ||||
|                 android:name="io.flutter.embedding.android.SplashScreenDrawable" | ||||
|                 android:resource="@drawable/launch_background" /> | ||||
|  | ||||
|             <!-- Theme to apply as soon as Flutter begins rendering frames --> | ||||
|             <meta-data | ||||
|   | ||||
							
								
								
									
										9
									
								
								android/app/src/main/res/values-v31/styles.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								android/app/src/main/res/values-v31/styles.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <resources> | ||||
|     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar"> | ||||
|         <!-- Show a splash screen on the activity. Automatically removed when | ||||
|              Flutter draws its first frame --> | ||||
|         <item name="android:windowSplashScreenBackground">@color/splash_screen_background</item> | ||||
|         <item name="android:windowSplashScreenAnimatedIcon">@drawable/launch_background</item> | ||||
|     </style> | ||||
| </resources> | ||||
| @@ -1,14 +1,14 @@ | ||||
| buildscript { | ||||
|  | ||||
|     ext.kotlin_version = '1.5.10' | ||||
|     ext.kotlin_version = '1.8.10' | ||||
|  | ||||
|     repositories { | ||||
|         google() | ||||
|         jcenter() | ||||
|         mavenCentral() | ||||
|     } | ||||
|  | ||||
|     dependencies { | ||||
|         classpath 'com.android.tools.build:gradle:4.0.0' | ||||
|         classpath 'com.android.tools.build:gradle:7.4.1' | ||||
|         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||||
|     } | ||||
| } | ||||
| @@ -16,7 +16,7 @@ buildscript { | ||||
| allprojects { | ||||
|     repositories { | ||||
|         google() | ||||
|         jcenter() | ||||
|         mavenCentral() | ||||
|     } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| org.gradle.jvmargs=-Xmx1536M | ||||
| android.enableR8=true | ||||
| android.enableD8=true | ||||
| android.enableJetifier=true | ||||
| android.useAndroidX=true | ||||
| @@ -1,6 +1,6 @@ | ||||
| #Fri Jun 23 08:50:38 CEST 2017 | ||||
| distributionBase=GRADLE_USER_HOME | ||||
| distributionPath=wrapper/dists | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip | ||||
| networkTimeout=10000 | ||||
| zipStoreBase=GRADLE_USER_HOME | ||||
| zipStorePath=wrapper/dists | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip | ||||
		Reference in New Issue
	
	Block a user