David PHAM-VAN

Update android demo project

@@ -27,23 +27,18 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" @@ -27,23 +27,18 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27 27
28 android { 28 android {
29 compileSdkVersion flutter.compileSdkVersion 29 compileSdkVersion flutter.compileSdkVersion
  30 + ndkVersion flutter.ndkVersion
30 31
31 compileOptions { 32 compileOptions {
32 sourceCompatibility JavaVersion.VERSION_1_8 33 sourceCompatibility JavaVersion.VERSION_1_8
33 targetCompatibility JavaVersion.VERSION_1_8 34 targetCompatibility JavaVersion.VERSION_1_8
34 } 35 }
35 36
36 - kotlinOptions {  
37 - jvmTarget = '1.8'  
38 - }  
39 -  
40 - sourceSets {  
41 - main.java.srcDirs += 'src/main/kotlin'  
42 - }  
43 -  
44 defaultConfig { 37 defaultConfig {
45 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). 38 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
46 applicationId "net.nfet.printing_demo" 39 applicationId "net.nfet.printing_demo"
  40 + // You can update the following values to match your application needs.
  41 + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
47 minSdkVersion flutter.minSdkVersion 42 minSdkVersion flutter.minSdkVersion
48 targetSdkVersion flutter.targetSdkVersion 43 targetSdkVersion flutter.targetSdkVersion
49 versionCode flutterVersionCode.toInteger() 44 versionCode flutterVersionCode.toInteger()
@@ -62,7 +57,3 @@ android { @@ -62,7 +57,3 @@ android {
62 flutter { 57 flutter {
63 source '../..' 58 source '../..'
64 } 59 }
65 -  
66 -dependencies {  
67 - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"  
68 -}  
1 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 1 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2 package="net.nfet.printing_demo"> 2 package="net.nfet.printing_demo">
3 - <!-- Flutter needs it to communicate with the running application 3 + <!-- The INTERNET permission is required for development. Specifically,
  4 + the Flutter tool needs it to communicate with the running application
4 to allow setting breakpoints, to provide hot reload, etc. 5 to allow setting breakpoints, to provide hot reload, etc.
5 --> 6 -->
6 <uses-permission android:name="android.permission.INTERNET"/> 7 <uses-permission android:name="android.permission.INTERNET"/>
@@ -31,4 +31,6 @@ @@ -31,4 +31,6 @@
31 android:name="flutterEmbedding" 31 android:name="flutterEmbedding"
32 android:value="2" /> 32 android:value="2" />
33 </application> 33 </application>
  34 +
  35 + <uses-permission android:name="android.permission.INTERNET"/>
34 </manifest> 36 </manifest>
  1 +package net.nfet.printing_demo;
  2 +
  3 +import io.flutter.embedding.android.FlutterActivity;
  4 +
  5 +public class MainActivity extends FlutterActivity {
  6 +}
1 -package net.nfet.printing_demo  
2 -  
3 -import io.flutter.embedding.android.FlutterActivity  
4 -  
5 -class MainActivity: FlutterActivity() {  
6 -}  
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on --> 3 <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
4 <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar"> 4 <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
5 <!-- Show a splash screen on the activity. Automatically removed when 5 <!-- Show a splash screen on the activity. Automatically removed when
6 - Flutter draws its first frame --> 6 + the Flutter engine draws its first frame -->
7 <item name="android:windowBackground">@drawable/launch_background</item> 7 <item name="android:windowBackground">@drawable/launch_background</item>
8 </style> 8 </style>
9 <!-- Theme applied to the Android Window as soon as the process has started. 9 <!-- Theme applied to the Android Window as soon as the process has started.
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off --> 3 <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
4 <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar"> 4 <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
5 <!-- Show a splash screen on the activity. Automatically removed when 5 <!-- Show a splash screen on the activity. Automatically removed when
6 - Flutter draws its first frame --> 6 + the Flutter engine draws its first frame -->
7 <item name="android:windowBackground">@drawable/launch_background</item> 7 <item name="android:windowBackground">@drawable/launch_background</item>
8 </style> 8 </style>
9 <!-- Theme applied to the Android Window as soon as the process has started. 9 <!-- Theme applied to the Android Window as soon as the process has started.
1 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 1 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2 package="net.nfet.printing_demo"> 2 package="net.nfet.printing_demo">
3 - <!-- Flutter needs it to communicate with the running application 3 + <!-- The INTERNET permission is required for development. Specifically,
  4 + the Flutter tool needs it to communicate with the running application
4 to allow setting breakpoints, to provide hot reload, etc. 5 to allow setting breakpoints, to provide hot reload, etc.
5 --> 6 -->
6 <uses-permission android:name="android.permission.INTERNET"/> 7 <uses-permission android:name="android.permission.INTERNET"/>
1 buildscript { 1 buildscript {
2 - ext.kotlin_version = '1.3.50' 2 + ext.kotlin_version = '1.6.10'
3 repositories { 3 repositories {
4 google() 4 google()
5 mavenCentral() 5 mavenCentral()
6 } 6 }
7 7
8 dependencies { 8 dependencies {
9 - classpath 'com.android.tools.build:gradle:4.1.0' 9 + classpath 'com.android.tools.build:gradle:7.1.2'
10 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 10 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11 } 11 }
12 } 12 }
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
3 distributionPath=wrapper/dists 3 distributionPath=wrapper/dists
4 zipStoreBase=GRADLE_USER_HOME 4 zipStoreBase=GRADLE_USER_HOME
5 zipStorePath=wrapper/dists 5 zipStorePath=wrapper/dists
6 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip 6 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip