From cf87c48976b4b5521234d3c8a8680fed82d77142 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Tue, 27 Jul 2021 08:59:41 +0530 Subject: [PATCH 01/22] flutter support: initial commit --- README.md | 4 +- android/.gitignore | 8 +++ android/build.gradle | 40 +++++++++++ android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 5 ++ android/settings.gradle | 1 + android/src/main/AndroidManifest.xml | 3 + .../kotlin/dev/google/cronet/CronetPlugin.kt | 36 ++++++++++ example/README.md | 3 +- example/{ => cli}/bin/example_dart.dart | 0 example/{ => cli}/pubspec.yaml | 2 +- example/flutter/.gitignore | 46 +++++++++++++ example/flutter/.metadata | 10 +++ example/flutter/android/.gitignore | 11 +++ example/flutter/android/app/build.gradle | 59 ++++++++++++++++ .../android/app/src/debug/AndroidManifest.xml | 7 ++ .../android/app/src/main/AndroidManifest.xml | 41 +++++++++++ .../dev/google/cronet_example/MainActivity.kt | 6 ++ .../res/drawable-v21/launch_background.xml | 12 ++++ .../main/res/drawable/launch_background.xml | 12 ++++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 +++++ .../app/src/main/res/values/styles.xml | 18 +++++ .../app/src/profile/AndroidManifest.xml | 7 ++ example/flutter/android/build.gradle | 31 +++++++++ example/flutter/android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 6 ++ example/flutter/android/settings.gradle | 11 +++ example/flutter/bin/example_dart.dart | 29 ++++++++ example/flutter/lib/main.dart | 58 ++++++++++++++++ example/flutter/pubspec.yaml | 65 ++++++++++++++++++ example/flutter/test/widget_test.dart | 27 ++++++++ pubspec.yaml | 8 +++ 37 files changed, 587 insertions(+), 3 deletions(-) create mode 100644 android/.gitignore create mode 100644 android/build.gradle create mode 100644 android/gradle.properties create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100644 android/settings.gradle create mode 100644 android/src/main/AndroidManifest.xml create mode 100644 android/src/main/kotlin/dev/google/cronet/CronetPlugin.kt rename example/{ => cli}/bin/example_dart.dart (100%) rename example/{ => cli}/pubspec.yaml (93%) create mode 100644 example/flutter/.gitignore create mode 100644 example/flutter/.metadata create mode 100644 example/flutter/android/.gitignore create mode 100644 example/flutter/android/app/build.gradle create mode 100644 example/flutter/android/app/src/debug/AndroidManifest.xml create mode 100644 example/flutter/android/app/src/main/AndroidManifest.xml create mode 100644 example/flutter/android/app/src/main/kotlin/dev/google/cronet_example/MainActivity.kt create mode 100644 example/flutter/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 example/flutter/android/app/src/main/res/drawable/launch_background.xml create mode 100644 example/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 example/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 example/flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 example/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 example/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 example/flutter/android/app/src/main/res/values-night/styles.xml create mode 100644 example/flutter/android/app/src/main/res/values/styles.xml create mode 100644 example/flutter/android/app/src/profile/AndroidManifest.xml create mode 100644 example/flutter/android/build.gradle create mode 100644 example/flutter/android/gradle.properties create mode 100644 example/flutter/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 example/flutter/android/settings.gradle create mode 100644 example/flutter/bin/example_dart.dart create mode 100644 example/flutter/lib/main.dart create mode 100644 example/flutter/pubspec.yaml create mode 100644 example/flutter/test/widget_test.dart diff --git a/README.md b/README.md index 4b3676d..3ad59d3 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,10 @@ Currently, 64 bit Desktop Platforms (Linux, Windows and MacOS) are supported. ## Run Example +### Dart CLI + ```bash -cd example +cd example/cli dart run cronet:setup # Downloads the cronet binaries. dart run ``` diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 0000000..c6cbe56 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,8 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 0000000..5d3080e --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,40 @@ +group 'dev.google.cronet' +version '1.0-SNAPSHOT' + +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:4.1.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +rootProject.allprojects { + repositories { + google() + jcenter() + } +} + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' + +android { + compileSdkVersion 30 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + defaultConfig { + minSdkVersion 16 + } +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 0000000..94adc3a --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3c9d085 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/android/settings.gradle b/android/settings.gradle new file mode 100644 index 0000000..43fd67c --- /dev/null +++ b/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'cronet' diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml new file mode 100644 index 0000000..e663fbd --- /dev/null +++ b/android/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/android/src/main/kotlin/dev/google/cronet/CronetPlugin.kt b/android/src/main/kotlin/dev/google/cronet/CronetPlugin.kt new file mode 100644 index 0000000..868aa2f --- /dev/null +++ b/android/src/main/kotlin/dev/google/cronet/CronetPlugin.kt @@ -0,0 +1,36 @@ +package dev.google.cronet + +import androidx.annotation.NonNull + +import io.flutter.embedding.engine.plugins.FlutterPlugin +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel +import io.flutter.plugin.common.MethodChannel.MethodCallHandler +import io.flutter.plugin.common.MethodChannel.Result +import io.flutter.plugin.common.PluginRegistry.Registrar + +/** CronetPlugin */ +class CronetPlugin: FlutterPlugin, MethodCallHandler { + /// The MethodChannel that will the communication between Flutter and native Android + /// + /// This local reference serves to register the plugin with the Flutter Engine and unregister it + /// when the Flutter Engine is detached from the Activity + private lateinit var channel : MethodChannel + + override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) { + channel = MethodChannel(flutterPluginBinding.binaryMessenger, "cronet") + channel.setMethodCallHandler(this) + } + + override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) { + if (call.method == "getPlatformVersion") { + result.success("Android ${android.os.Build.VERSION.RELEASE}") + } else { + result.notImplemented() + } + } + + override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) { + channel.setMethodCallHandler(null) + } +} diff --git a/example/README.md b/example/README.md index b347cb2..e829456 100644 --- a/example/README.md +++ b/example/README.md @@ -1,4 +1,5 @@ ## Examples - [Bare Minimum](https://github.com/google/cronet.dart#example) -- [Simple (Dart CLI)](https://github.com/google/cronet.dart/tree/main/example/) +- [Simple (Dart CLI)](https://github.com/google/cronet.dart/tree/main/example/cli) +- [Simple (Flutter)](https://github.com/google/cronet.dart/tree/main/example/flutter) diff --git a/example/bin/example_dart.dart b/example/cli/bin/example_dart.dart similarity index 100% rename from example/bin/example_dart.dart rename to example/cli/bin/example_dart.dart diff --git a/example/pubspec.yaml b/example/cli/pubspec.yaml similarity index 93% rename from example/pubspec.yaml rename to example/cli/pubspec.yaml index 9d9c44a..9cd17fe 100644 --- a/example/pubspec.yaml +++ b/example/cli/pubspec.yaml @@ -8,7 +8,7 @@ environment: dependencies: cronet: - path: ../ + path: ../../ dev_dependencies: lints: ^1.0.1 diff --git a/example/flutter/.gitignore b/example/flutter/.gitignore new file mode 100644 index 0000000..0fa6b67 --- /dev/null +++ b/example/flutter/.gitignore @@ -0,0 +1,46 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/example/flutter/.metadata b/example/flutter/.metadata new file mode 100644 index 0000000..c1ee81b --- /dev/null +++ b/example/flutter/.metadata @@ -0,0 +1,10 @@ +# 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 and should not be manually edited. + +version: + revision: 1d9032c7e1d867f071f2277eb1673e8f9b0274e3 + channel: stable + +project_type: app diff --git a/example/flutter/android/.gitignore b/example/flutter/android/.gitignore new file mode 100644 index 0000000..0a741cb --- /dev/null +++ b/example/flutter/android/.gitignore @@ -0,0 +1,11 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties diff --git a/example/flutter/android/app/build.gradle b/example/flutter/android/app/build.gradle new file mode 100644 index 0000000..4393295 --- /dev/null +++ b/example/flutter/android/app/build.gradle @@ -0,0 +1,59 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +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' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion 30 + + 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 "dev.google.cronet_example" + minSdkVersion 16 + targetSdkVersion 30 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/example/flutter/android/app/src/debug/AndroidManifest.xml b/example/flutter/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..b9a3083 --- /dev/null +++ b/example/flutter/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/example/flutter/android/app/src/main/AndroidManifest.xml b/example/flutter/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..bbb3166 --- /dev/null +++ b/example/flutter/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + diff --git a/example/flutter/android/app/src/main/kotlin/dev/google/cronet_example/MainActivity.kt b/example/flutter/android/app/src/main/kotlin/dev/google/cronet_example/MainActivity.kt new file mode 100644 index 0000000..e50b8b7 --- /dev/null +++ b/example/flutter/android/app/src/main/kotlin/dev/google/cronet_example/MainActivity.kt @@ -0,0 +1,6 @@ +package dev.google.cronet_example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/example/flutter/android/app/src/main/res/drawable-v21/launch_background.xml b/example/flutter/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/example/flutter/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/example/flutter/android/app/src/main/res/drawable/launch_background.xml b/example/flutter/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/example/flutter/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/example/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/example/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/example/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/example/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/example/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/example/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/example/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/example/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/example/flutter/android/app/src/main/res/values-night/styles.xml b/example/flutter/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..449a9f9 --- /dev/null +++ b/example/flutter/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/example/flutter/android/app/src/main/res/values/styles.xml b/example/flutter/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..d74aa35 --- /dev/null +++ b/example/flutter/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/example/flutter/android/app/src/profile/AndroidManifest.xml b/example/flutter/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..b9a3083 --- /dev/null +++ b/example/flutter/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/example/flutter/android/build.gradle b/example/flutter/android/build.gradle new file mode 100644 index 0000000..c505a86 --- /dev/null +++ b/example/flutter/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:4.1.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/example/flutter/android/gradle.properties b/example/flutter/android/gradle.properties new file mode 100644 index 0000000..94adc3a --- /dev/null +++ b/example/flutter/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/example/flutter/android/gradle/wrapper/gradle-wrapper.properties b/example/flutter/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..bc6a58a --- /dev/null +++ b/example/flutter/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/example/flutter/android/settings.gradle b/example/flutter/android/settings.gradle new file mode 100644 index 0000000..44e62bc --- /dev/null +++ b/example/flutter/android/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +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" diff --git a/example/flutter/bin/example_dart.dart b/example/flutter/bin/example_dart.dart new file mode 100644 index 0000000..2f34646 --- /dev/null +++ b/example/flutter/bin/example_dart.dart @@ -0,0 +1,29 @@ +import 'dart:convert'; + +import 'package:cronet/cronet.dart'; + +/* Trying to re-impliment: https://chromium.googlesource.com/chromium/src/+/master/components/cronet/native/sample/main.cc */ + +void main(List args) { + final stopwatch = Stopwatch()..start(); + final client = HttpClient(); + for (var i = 0; i < 3; i++) { + // Demo - with concurrent requests + client + .getUrl(Uri.parse('https://example.com')) + .then((HttpClientRequest request) { + if (i == 2) { + client.close(); // We will shut down the client after 3 connections. + } + return request.close(); + }).then((HttpClientResponse response) { + response.transform(utf8.decoder).listen((contents) { + print(contents); + }, onDone: () { + print('cronet implemenation took: ${stopwatch.elapsedMilliseconds} ms'); + }, onError: (Object e) { + print(e); + }); + }); + } +} diff --git a/example/flutter/lib/main.dart b/example/flutter/lib/main.dart new file mode 100644 index 0000000..9e86bdb --- /dev/null +++ b/example/flutter/lib/main.dart @@ -0,0 +1,58 @@ +import 'package:flutter/material.dart'; +import 'dart:async'; + +import 'package:flutter/services.dart'; +import 'package:cronet/cronet.dart'; + +void main() { + runApp(MyApp()); +} + +class MyApp extends StatefulWidget { + @override + _MyAppState createState() => _MyAppState(); +} + +class _MyAppState extends State { + String _platformVersion = 'Unknown'; + + @override + void initState() { + super.initState(); + initPlatformState(); + } + + // Platform messages are asynchronous, so we initialize in an async method. + Future initPlatformState() async { + String platformVersion; + // Platform messages may fail, so we use a try/catch PlatformException. + try { + platformVersion = await Cronet.platformVersion; + } on PlatformException { + platformVersion = 'Failed to get platform version.'; + } + + // If the widget was removed from the tree while the asynchronous platform + // message was in flight, we want to discard the reply rather than calling + // setState to update our non-existent appearance. + if (!mounted) return; + + setState(() { + _platformVersion = platformVersion; + }); + } + + @override + Widget build(BuildContext context) { + return MaterialApp( + home: Scaffold( + appBar: AppBar( + title: const Text('Plugin example app'), + ), + body: Center( + child: Text('Running on: $_platformVersion\n'), + ), + ), + ); + } +} diff --git a/example/flutter/pubspec.yaml b/example/flutter/pubspec.yaml new file mode 100644 index 0000000..c76d65f --- /dev/null +++ b/example/flutter/pubspec.yaml @@ -0,0 +1,65 @@ +name: cronet_flutter_sample +description: Demonstrates how to use the cronet plugin. + +# The following line prevents the package from being accidentally published to +# pub.dev using `pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +environment: + sdk: ">=2.12.0 <3.0.0" + +dependencies: + flutter: + sdk: flutter + cronet: + path: ../../ + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.2 + +dev_dependencies: + flutter_test: + sdk: flutter + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware. + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/assets-and-images/#from-packages + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/custom-fonts/#from-packages \ No newline at end of file diff --git a/example/flutter/test/widget_test.dart b/example/flutter/test/widget_test.dart new file mode 100644 index 0000000..7849897 --- /dev/null +++ b/example/flutter/test/widget_test.dart @@ -0,0 +1,27 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility that Flutter provides. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:cronet_example/main.dart'; + +void main() { + testWidgets('Verify Platform version', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(MyApp()); + + // Verify that platform version is retrieved. + expect( + find.byWidgetPredicate( + (Widget widget) => widget is Text && + widget.data.startsWith('Running on:'), + ), + findsOneWidget, + ); + }); +} diff --git a/pubspec.yaml b/pubspec.yaml index fc36e52..512893e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,6 +9,7 @@ description: Experimental Cronet dart bindings. environment: sdk: '>=2.12.0 <3.0.0' + # flutter: '>=1.20.0' dependencies: ffi: ^1.1.2 @@ -21,3 +22,10 @@ dev_dependencies: ffigen: ^2.4.2 lints: ^1.0.1 test: ^1.17.5 + +flutter: + plugin: + platforms: + android: + package: dev.google.cronet + pluginClass: CronetPlugin From 11e8c1132be38322ab2e2131ac985d9671170c85 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Tue, 27 Jul 2021 12:09:41 +0530 Subject: [PATCH 02/22] implement: android support --- android/build.gradle | 13 ++++ android/src/main/AndroidManifest.xml | 2 + .../kotlin/dev/google/cronet/CronetPlugin.kt | 5 ++ example/cli/analysis_options.yaml | 14 ++++ example/cli/bin/example_dart.dart | 4 ++ example/flutter/analysis_options.yaml | 14 ++++ .../android/app/src/main/AndroidManifest.xml | 5 +- example/flutter/lib/main.dart | 70 +++++++++++++------ example/flutter/pubspec.yaml | 3 +- example/flutter/test/widget_test.dart | 27 ------- lib/src/constants.dart | 4 +- src/CMakeLists.txt | 6 +- 12 files changed, 113 insertions(+), 54 deletions(-) create mode 100644 example/cli/analysis_options.yaml create mode 100644 example/flutter/analysis_options.yaml delete mode 100644 example/flutter/test/widget_test.dart diff --git a/android/build.gradle b/android/build.gradle index 5d3080e..642dca7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -30,11 +30,24 @@ android { sourceSets { main.java.srcDirs += 'src/main/kotlin' } + + externalNativeBuild { + // Encapsulates your CMake build configurations. + cmake { + // Provides a relative path to your CMake build script. + path "../src/CMakeLists.txt" + } + } + defaultConfig { minSdkVersion 16 + ndk { + abiFilters 'arm64-v8a' + } } } dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation files(fileTree(dir: 'libs', includes: ['*.jar'])) } diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index e663fbd..32593b5 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,5 @@ + + diff --git a/android/src/main/kotlin/dev/google/cronet/CronetPlugin.kt b/android/src/main/kotlin/dev/google/cronet/CronetPlugin.kt index 868aa2f..7f46e44 100644 --- a/android/src/main/kotlin/dev/google/cronet/CronetPlugin.kt +++ b/android/src/main/kotlin/dev/google/cronet/CronetPlugin.kt @@ -9,6 +9,8 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler import io.flutter.plugin.common.MethodChannel.Result import io.flutter.plugin.common.PluginRegistry.Registrar +import org.chromium.base.ContextUtils + /** CronetPlugin */ class CronetPlugin: FlutterPlugin, MethodCallHandler { /// The MethodChannel that will the communication between Flutter and native Android @@ -18,6 +20,9 @@ class CronetPlugin: FlutterPlugin, MethodCallHandler { private lateinit var channel : MethodChannel override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) { + System.loadLibrary("cronet.86.0.4240.198") + System.loadLibrary("wrapper") + ContextUtils.initApplicationContext(flutterPluginBinding.applicationContext) channel = MethodChannel(flutterPluginBinding.binaryMessenger, "cronet") channel.setMethodCallHandler(this) } diff --git a/example/cli/analysis_options.yaml b/example/cli/analysis_options.yaml new file mode 100644 index 0000000..3743f9b --- /dev/null +++ b/example/cli/analysis_options.yaml @@ -0,0 +1,14 @@ +# Copyright (c) 2021, the Dart project authors. Please see the AUTHORS file +# for details. All rights reserved. Use of this source code is governed by a +# BSD-style license that can be found in the LICENSE file. + +include: package:lints/recommended.yaml + +analyzer: + strong-mode: + implicit-casts: false + implicit-dynamic: false +linter: + rules: + - directives_ordering + - lines_longer_than_80_chars diff --git a/example/cli/bin/example_dart.dart b/example/cli/bin/example_dart.dart index 2f34646..cccf762 100644 --- a/example/cli/bin/example_dart.dart +++ b/example/cli/bin/example_dart.dart @@ -1,3 +1,7 @@ +// Copyright (c) 2021, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + import 'dart:convert'; import 'package:cronet/cronet.dart'; diff --git a/example/flutter/analysis_options.yaml b/example/flutter/analysis_options.yaml new file mode 100644 index 0000000..3743f9b --- /dev/null +++ b/example/flutter/analysis_options.yaml @@ -0,0 +1,14 @@ +# Copyright (c) 2021, the Dart project authors. Please see the AUTHORS file +# for details. All rights reserved. Use of this source code is governed by a +# BSD-style license that can be found in the LICENSE file. + +include: package:lints/recommended.yaml + +analyzer: + strong-mode: + implicit-casts: false + implicit-dynamic: false +linter: + rules: + - directives_ordering + - lines_longer_than_80_chars diff --git a/example/flutter/android/app/src/main/AndroidManifest.xml b/example/flutter/android/app/src/main/AndroidManifest.xml index bbb3166..59e3845 100644 --- a/example/flutter/android/app/src/main/AndroidManifest.xml +++ b/example/flutter/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,11 @@ + + + android:icon="@mipmap/ic_launcher" + android:usesCleartextTraffic="true"> { - String _platformVersion = 'Unknown'; + String data = ''; + bool _fetching = false; + final client = HttpClient(); + final _stopwatch = Stopwatch(); @override void initState() { super.initState(); - initPlatformState(); + request(); } - // Platform messages are asynchronous, so we initialize in an async method. - Future initPlatformState() async { - String platformVersion; - // Platform messages may fail, so we use a try/catch PlatformException. - try { - platformVersion = await Cronet.platformVersion; - } on PlatformException { - platformVersion = 'Failed to get platform version.'; - } - - // If the widget was removed from the tree while the asynchronous platform - // message was in flight, we want to discard the reply rather than calling - // setState to update our non-existent appearance. - if (!mounted) return; - + void request() { setState(() { - _platformVersion = platformVersion; + _fetching = true; + data = ''; + }); + client + .getUrl(Uri.parse('http://info.cern.ch/')) + .then((HttpClientRequest request) { + _stopwatch.reset(); + _stopwatch.start(); + return request.close(); + }).then((Stream> response) { + response.transform(utf8.decoder).listen((contents) { + setState(() { + data += contents; + }); + }, onDone: () { + _stopwatch.stop(); + setState(() { + _fetching = false; + }); + }, onError: (dynamic e) { + setState(() { + data = e.toString(); + }); + }); }); } @@ -47,10 +63,20 @@ class _MyAppState extends State { return MaterialApp( home: Scaffold( appBar: AppBar( - title: const Text('Plugin example app'), + title: const Text('Cronet Flutter Example'), ), body: Center( - child: Text('Running on: $_platformVersion\n'), + child: Column(children: [ + Text('Cronet Version: ${client.httpClientVersion}'), + _fetching + ? CircularProgressIndicator() + : Expanded(child: SingleChildScrollView(child: Text(data))), + Text('Time taken: ${_stopwatch.elapsedMilliseconds} ms') + ])), + floatingActionButton: FloatingActionButton( + tooltip: 'Reload', + child: Icon(Icons.replay_outlined), + onPressed: () => request(), ), ), ); diff --git a/example/flutter/pubspec.yaml b/example/flutter/pubspec.yaml index c76d65f..8368f16 100644 --- a/example/flutter/pubspec.yaml +++ b/example/flutter/pubspec.yaml @@ -1,4 +1,4 @@ -name: cronet_flutter_sample +name: cronet_example description: Demonstrates how to use the cronet plugin. # The following line prevents the package from being accidentally published to @@ -21,6 +21,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter + lints: ^1.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/example/flutter/test/widget_test.dart b/example/flutter/test/widget_test.dart deleted file mode 100644 index 7849897..0000000 --- a/example/flutter/test/widget_test.dart +++ /dev/null @@ -1,27 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility that Flutter provides. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:cronet_example/main.dart'; - -void main() { - testWidgets('Verify Platform version', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(MyApp()); - - // Verify that platform version is retrieved. - expect( - find.byWidgetPredicate( - (Widget widget) => widget is Text && - widget.data.startsWith('Running on:'), - ), - findsOneWidget, - ); - }); -} diff --git a/lib/src/constants.dart b/lib/src/constants.dart index f0e8911..f6fdeba 100644 --- a/lib/src/constants.dart +++ b/lib/src/constants.dart @@ -22,7 +22,9 @@ String getDylibName(String name, [String platform = '']) { ext = '.dll'; } else if (Platform.isMacOS || platform.startsWith('macos')) { ext = '.dylib'; - } else if (!(Platform.isLinux || platform.startsWith('linux'))) { + } else if (!(Platform.isLinux || + platform.startsWith('linux') || + Platform.isAndroid)) { // If NOT even linux, then unsupported. throw Exception('Unsupported Platform.'); } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 262a75f..38d8e1e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.10) set(PROJECT_NAME "cronet") project(${PROJECT_NAME} LANGUAGES C CXX) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -8,7 +8,9 @@ set(CMAKE_CXX_STANDARD 11) # not be changed set(PLUGIN_NAME "wrapper") -add_compile_definitions(DART_SHARED_LIB) +if(NOT ANDROID) + add_compile_definitions(DART_SHARED_LIB) +endif (NOT ANDROID) add_library(${PLUGIN_NAME} SHARED "wrapper.cc" From d0ea73973b67b4cbe283d781a2f2ea9035d28e9e Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Tue, 27 Jul 2021 12:22:05 +0530 Subject: [PATCH 03/22] CI: exclude flutter sample from dart analyze --- analysis_options.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/analysis_options.yaml b/analysis_options.yaml index 3743f9b..102b29b 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -5,6 +5,7 @@ include: package:lints/recommended.yaml analyzer: + exclude: [example/flutter/**] strong-mode: implicit-casts: false implicit-dynamic: false From 1b6a8a2d2397ccd116fca0ce7e68f439847ce1f8 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 28 Jul 2021 09:38:00 +0530 Subject: [PATCH 04/22] flutter: add linux support --- example/flutter/README.md | 16 +++ example/flutter/linux/.gitignore | 1 + example/flutter/linux/CMakeLists.txt | 106 ++++++++++++++++++ example/flutter/linux/flutter/CMakeLists.txt | 91 +++++++++++++++ .../flutter/generated_plugin_registrant.cc | 9 ++ .../flutter/generated_plugin_registrant.h | 13 +++ .../linux/flutter/generated_plugins.cmake | 15 +++ example/flutter/linux/main.cc | 6 + example/flutter/linux/my_application.cc | 104 +++++++++++++++++ example/flutter/linux/my_application.h | 18 +++ example/flutter/test/widget_test.dart | 30 +++++ 11 files changed, 409 insertions(+) create mode 100644 example/flutter/README.md create mode 100644 example/flutter/linux/.gitignore create mode 100644 example/flutter/linux/CMakeLists.txt create mode 100644 example/flutter/linux/flutter/CMakeLists.txt create mode 100644 example/flutter/linux/flutter/generated_plugin_registrant.cc create mode 100644 example/flutter/linux/flutter/generated_plugin_registrant.h create mode 100644 example/flutter/linux/flutter/generated_plugins.cmake create mode 100644 example/flutter/linux/main.cc create mode 100644 example/flutter/linux/my_application.cc create mode 100644 example/flutter/linux/my_application.h create mode 100644 example/flutter/test/widget_test.dart diff --git a/example/flutter/README.md b/example/flutter/README.md new file mode 100644 index 0000000..ec2531b --- /dev/null +++ b/example/flutter/README.md @@ -0,0 +1,16 @@ +# cronet_example + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) + +For help getting started with Flutter, view our +[online documentation](https://flutter.dev/docs), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/example/flutter/linux/.gitignore b/example/flutter/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/example/flutter/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/example/flutter/linux/CMakeLists.txt b/example/flutter/linux/CMakeLists.txt new file mode 100644 index 0000000..8c959ed --- /dev/null +++ b/example/flutter/linux/CMakeLists.txt @@ -0,0 +1,106 @@ +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +set(BINARY_NAME "cronet_example") +set(APPLICATION_ID "dev.google.cronet_example") + +cmake_policy(SET CMP0063 NEW) + +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Configure build options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") + +# Flutter library and tool build rules. +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Application build +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) +apply_standard_settings(${BINARY_NAME}) +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) +add_dependencies(${BINARY_NAME} flutter_assemble) +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/example/flutter/linux/flutter/CMakeLists.txt b/example/flutter/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..a1da1b9 --- /dev/null +++ b/example/flutter/linux/flutter/CMakeLists.txt @@ -0,0 +1,91 @@ +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) +pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid) +pkg_check_modules(LZMA REQUIRED IMPORTED_TARGET liblzma) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO + PkgConfig::BLKID + PkgConfig::LZMA +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + linux-x64 ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/example/flutter/linux/flutter/generated_plugin_registrant.cc b/example/flutter/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..d38195a --- /dev/null +++ b/example/flutter/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,9 @@ +// +// Generated file. Do not edit. +// + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/example/flutter/linux/flutter/generated_plugin_registrant.h b/example/flutter/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..9bf7478 --- /dev/null +++ b/example/flutter/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,13 @@ +// +// Generated file. Do not edit. +// + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/example/flutter/linux/flutter/generated_plugins.cmake b/example/flutter/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..51436ae --- /dev/null +++ b/example/flutter/linux/flutter/generated_plugins.cmake @@ -0,0 +1,15 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) diff --git a/example/flutter/linux/main.cc b/example/flutter/linux/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/example/flutter/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/example/flutter/linux/my_application.cc b/example/flutter/linux/my_application.cc new file mode 100644 index 0000000..436dc6d --- /dev/null +++ b/example/flutter/linux/my_application.cc @@ -0,0 +1,104 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen *screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "cronet_example"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } + else { + gtk_window_set_title(window, "cronet_example"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar ***arguments, int *exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject *object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + nullptr)); +} diff --git a/example/flutter/linux/my_application.h b/example/flutter/linux/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/example/flutter/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/example/flutter/test/widget_test.dart b/example/flutter/test/widget_test.dart new file mode 100644 index 0000000..8217f0c --- /dev/null +++ b/example/flutter/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility that Flutter provides. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:cronet_example/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} From 6094162d3fadeec14d49ea7cb4bfa60160f9d992 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 28 Jul 2021 11:26:40 +0530 Subject: [PATCH 05/22] update tools/setup for android --- .gitignore | 1 + CHANGELOG.md | 4 +++ android/build.gradle | 3 -- bin/setup.dart | 31 +++++++++++++++++++ lib/src/constants.dart | 8 +++-- lib/src/third_party/ffigen/find_resource.dart | 5 ++- pubspec.yaml | 2 +- tool/update_tars.dart | 29 ++++++++++++++++- 8 files changed, 74 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b4a057b..0c1dd38 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ doc/api/ .history .vscode compile_commands.json +*.log # IntelliJ *.iml diff --git a/CHANGELOG.md b/CHANGELOG.md index 914a1cf..543e91d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.4 + +* Added support for Android and Flutter Desktops (Windows/Linux). + ## 0.0.3 * Using `package:args` for handling CLI arguments. diff --git a/android/build.gradle b/android/build.gradle index 642dca7..e3bdcc1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -41,9 +41,6 @@ android { defaultConfig { minSdkVersion 16 - ndk { - abiFilters 'arm64-v8a' - } } } diff --git a/bin/setup.dart b/bin/setup.dart index ee70e9f..5853db9 100644 --- a/bin/setup.dart +++ b/bin/setup.dart @@ -9,6 +9,7 @@ import 'package:args/command_runner.dart'; import 'package:cli_util/cli_logging.dart' show Ansi, Logger; import 'package:cronet/src/constants.dart'; import 'package:cronet/src/third_party/ffigen/find_resource.dart'; +import 'package:path/path.dart'; // Extracts a tar.gz file. void extract(String fileName, [String dir = '']) { @@ -28,6 +29,30 @@ void extract(String fileName, [String dir = '']) { } } +/// Places downloaded mobile binaries to proper location. +void placeMobileBinaries(String platform, String fileName) { + final android = + '${findPackageRoot().toFilePath(windows: Platform.isWindows)}/android'; + Directory('$android/libs').createSync(); + Directory('$binaryStorageDir/$platform/libs').listSync().forEach((jar) { + if (jar is File) { + jar.renameSync('$android/libs/${basename(jar.path)}'); + } + }); + Directory('$android/src/main/jniLibs').createSync(); + Directory('$binaryStorageDir/$platform/jniLibs') + .listSync(recursive: true) + .forEach((cronet) { + if (cronet is File) { + Directory('$android/src/main/jniLibs/${basename(cronet.parent.path)}') + .createSync(); + cronet.renameSync( + '$android/src/main/jniLibs/${basename(cronet.parent.path)}' + '/${basename(cronet.path)}'); + } + }); +} + /// Places downloaded binaries to proper location. void placeBinaries(String platform, String fileName) { final logger = Logger.standard(); @@ -35,6 +60,9 @@ void placeBinaries(String platform, String fileName) { logger.stdout('${ansi.yellow}Extracting Cronet for $platform${ansi.none}'); Directory(binaryStorageDir).createSync(recursive: true); extract(fileName, binaryStorageDir); + if (mobilePlatforms.contains(platform)) { + placeMobileBinaries(platform, fileName); + } logger.stdout('Done! Cleaning up...'); File(fileName).deleteSync(); @@ -238,6 +266,9 @@ Future main(List args) async { if (validPlatforms.contains('${Platform.operatingSystem}64')) { await downloadCronetBinaries('${Platform.operatingSystem}64'); } + if (Directory('android').existsSync()) { + await downloadCronetBinaries('android'); + } } else { await runner.run(args); } diff --git a/lib/src/constants.dart b/lib/src/constants.dart index f6fdeba..c24c40b 100644 --- a/lib/src/constants.dart +++ b/lib/src/constants.dart @@ -4,10 +4,12 @@ import 'dart:io' show Platform; -const validPlatforms = ['linux64', 'windows64', 'macos64']; -const tag = 'binaries-v0.0.2'; +const desktopPlatforms = ['linux64', 'windows64', 'macos64']; +const mobilePlatforms = ['android']; +List get validPlatforms => desktopPlatforms + mobilePlatforms; +const tag = 'binaries-v0.0.4'; const cronetBinaryUrl = - 'https://github.com/google/cronet.dart/releases/download/$tag/'; + 'https://github.com/unsuitable001/cronet.dart/releases/download/$tag/'; const cronetVersion = "86.0.4240.198"; const wrapperVersion = "1"; diff --git a/lib/src/third_party/ffigen/find_resource.dart b/lib/src/third_party/ffigen/find_resource.dart index 9c1968b..3ecc48c 100644 --- a/lib/src/third_party/ffigen/find_resource.dart +++ b/lib/src/third_party/ffigen/find_resource.dart @@ -60,5 +60,8 @@ bool isCronetAvailable(String platform) { .existsSync() && File.fromUri(Directory.current.uri.resolve(getCronetName(platform))) .existsSync(); - return cronetBinaries || inRoot; + final inAndroidDir = platform == 'android' && + File.fromUri(findPackageRoot().resolve('android/libs/cronet_api.jar')) + .existsSync(); + return cronetBinaries || inRoot || inAndroidDir; } diff --git a/pubspec.yaml b/pubspec.yaml index 512893e..0721845 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ # BSD-style license that can be found in the LICENSE file. name: cronet -version: 0.0.3 +version: 0.0.4 homepage: https://github.com/google/cronet.dart description: Experimental Cronet dart bindings. diff --git a/tool/update_tars.dart b/tool/update_tars.dart index cee886d..802a19f 100644 --- a/tool/update_tars.dart +++ b/tool/update_tars.dart @@ -6,10 +6,12 @@ import 'dart:io'; import 'package:cronet/src/constants.dart'; +import 'package:cronet/src/third_party/ffigen/find_resource.dart'; +import 'package:path/path.dart'; void main() { Directory.current = Directory.current.uri.resolve('.dart_tool/cronet').path; - for (final platform in validPlatforms) { + for (final platform in desktopPlatforms) { if (File('$platform/${getCronetName(platform)}').existsSync()) { final result = Process.runSync('tar', ['-czvf', '$platform.tar.gz', platform]); @@ -20,4 +22,29 @@ void main() { '${getCronetName(platform)} not found in .dart_tool/cronet/$platform'); } } + // Make tarball for android releases. + final android = + '${findPackageRoot().toFilePath(windows: Platform.isWindows)}/android'; + if (!Directory('$android/libs').existsSync()) return; + Directory('android/libs').createSync(recursive: true); + Directory('$android/libs/').listSync().forEach((jar) { + if (jar is File) { + print(jar); + jar.copySync('android/libs/${basename(jar.path)}'); + } + }); + Directory('android/jniLibs').createSync(recursive: true); + Directory('$android/src/main/jniLibs/') + .listSync(recursive: true) + .forEach((cronet) { + if (cronet is File) { + print(cronet); + Directory('android/jniLibs/${basename(cronet.parent.path)}').createSync(); + cronet.copySync('android/jniLibs/${basename(cronet.parent.path)}' + '/${basename(cronet.path)}'); + } + }); + final result = Process.runSync('tar', ['-czvf', 'android.tar.gz', 'android']); + print(result.stdout); + print(result.stderr); } From bafdd35963e0c057b71aeefeb4c5a62beafa6253 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 28 Jul 2021 12:04:33 +0530 Subject: [PATCH 06/22] flutter: add windows support --- example/flutter/windows/.gitignore | 17 ++ example/flutter/windows/CMakeLists.txt | 95 +++++++ .../flutter/windows/flutter/CMakeLists.txt | 103 ++++++++ .../flutter/generated_plugin_registrant.cc | 9 + .../flutter/generated_plugin_registrant.h | 13 + .../windows/flutter/generated_plugins.cmake | 15 ++ example/flutter/windows/runner/CMakeLists.txt | 18 ++ example/flutter/windows/runner/Runner.rc | 121 +++++++++ .../flutter/windows/runner/flutter_window.cpp | 64 +++++ .../flutter/windows/runner/flutter_window.h | 39 +++ example/flutter/windows/runner/main.cpp | 42 +++ example/flutter/windows/runner/resource.h | 16 ++ .../windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes example/flutter/windows/runner/run_loop.cpp | 66 +++++ example/flutter/windows/runner/run_loop.h | 40 +++ .../windows/runner/runner.exe.manifest | 20 ++ example/flutter/windows/runner/utils.cpp | 64 +++++ example/flutter/windows/runner/utils.h | 19 ++ .../flutter/windows/runner/win32_window.cpp | 245 ++++++++++++++++++ example/flutter/windows/runner/win32_window.h | 98 +++++++ 20 files changed, 1104 insertions(+) create mode 100644 example/flutter/windows/.gitignore create mode 100644 example/flutter/windows/CMakeLists.txt create mode 100644 example/flutter/windows/flutter/CMakeLists.txt create mode 100644 example/flutter/windows/flutter/generated_plugin_registrant.cc create mode 100644 example/flutter/windows/flutter/generated_plugin_registrant.h create mode 100644 example/flutter/windows/flutter/generated_plugins.cmake create mode 100644 example/flutter/windows/runner/CMakeLists.txt create mode 100644 example/flutter/windows/runner/Runner.rc create mode 100644 example/flutter/windows/runner/flutter_window.cpp create mode 100644 example/flutter/windows/runner/flutter_window.h create mode 100644 example/flutter/windows/runner/main.cpp create mode 100644 example/flutter/windows/runner/resource.h create mode 100644 example/flutter/windows/runner/resources/app_icon.ico create mode 100644 example/flutter/windows/runner/run_loop.cpp create mode 100644 example/flutter/windows/runner/run_loop.h create mode 100644 example/flutter/windows/runner/runner.exe.manifest create mode 100644 example/flutter/windows/runner/utils.cpp create mode 100644 example/flutter/windows/runner/utils.h create mode 100644 example/flutter/windows/runner/win32_window.cpp create mode 100644 example/flutter/windows/runner/win32_window.h diff --git a/example/flutter/windows/.gitignore b/example/flutter/windows/.gitignore new file mode 100644 index 0000000..ec4098a --- /dev/null +++ b/example/flutter/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/example/flutter/windows/CMakeLists.txt b/example/flutter/windows/CMakeLists.txt new file mode 100644 index 0000000..716e134 --- /dev/null +++ b/example/flutter/windows/CMakeLists.txt @@ -0,0 +1,95 @@ +cmake_minimum_required(VERSION 3.15) +project(cronet_example LANGUAGES CXX) + +set(BINARY_NAME "cronet_example") + +cmake_policy(SET CMP0063 NEW) + +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Configure build options. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() + +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") + +# Flutter library and tool build rules. +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build +add_subdirectory("runner") + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/example/flutter/windows/flutter/CMakeLists.txt b/example/flutter/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..c10f4f6 --- /dev/null +++ b/example/flutter/windows/flutter/CMakeLists.txt @@ -0,0 +1,103 @@ +cmake_minimum_required(VERSION 3.15) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + windows-x64 $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/example/flutter/windows/flutter/generated_plugin_registrant.cc b/example/flutter/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..4bfa0f3 --- /dev/null +++ b/example/flutter/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,9 @@ +// +// Generated file. Do not edit. +// + +#include "generated_plugin_registrant.h" + + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/example/flutter/windows/flutter/generated_plugin_registrant.h b/example/flutter/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..9846246 --- /dev/null +++ b/example/flutter/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,13 @@ +// +// Generated file. Do not edit. +// + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/example/flutter/windows/flutter/generated_plugins.cmake b/example/flutter/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..4d10c25 --- /dev/null +++ b/example/flutter/windows/flutter/generated_plugins.cmake @@ -0,0 +1,15 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) diff --git a/example/flutter/windows/runner/CMakeLists.txt b/example/flutter/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..e993217 --- /dev/null +++ b/example/flutter/windows/runner/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required(VERSION 3.15) +project(runner LANGUAGES CXX) + +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "run_loop.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) +apply_standard_settings(${BINARY_NAME}) +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/example/flutter/windows/runner/Runner.rc b/example/flutter/windows/runner/Runner.rc new file mode 100644 index 0000000..98d2c71 --- /dev/null +++ b/example/flutter/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#ifdef FLUTTER_BUILD_NUMBER +#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#else +#define VERSION_AS_NUMBER 1,0,0 +#endif + +#ifdef FLUTTER_BUILD_NAME +#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "dev.google" "\0" + VALUE "FileDescription", "A new Flutter project." "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "cronet_example" "\0" + VALUE "LegalCopyright", "Copyright (C) 2021 dev.google. All rights reserved." "\0" + VALUE "OriginalFilename", "cronet_example.exe" "\0" + VALUE "ProductName", "cronet_example" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/example/flutter/windows/runner/flutter_window.cpp b/example/flutter/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..ac04f77 --- /dev/null +++ b/example/flutter/windows/runner/flutter_window.cpp @@ -0,0 +1,64 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(RunLoop* run_loop, + const flutter::DartProject& project) + : run_loop_(run_loop), project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + run_loop_->RegisterFlutterInstance(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + run_loop_->UnregisterFlutterInstance(flutter_controller_->engine()); + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opporutunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/example/flutter/windows/runner/flutter_window.h b/example/flutter/windows/runner/flutter_window.h new file mode 100644 index 0000000..ba86031 --- /dev/null +++ b/example/flutter/windows/runner/flutter_window.h @@ -0,0 +1,39 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "run_loop.h" +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow driven by the |run_loop|, hosting a + // Flutter view running |project|. + explicit FlutterWindow(RunLoop* run_loop, + const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The run loop driving events for this window. + RunLoop* run_loop_; + + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/example/flutter/windows/runner/main.cpp b/example/flutter/windows/runner/main.cpp new file mode 100644 index 0000000..d7975a1 --- /dev/null +++ b/example/flutter/windows/runner/main.cpp @@ -0,0 +1,42 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "run_loop.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + RunLoop run_loop; + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(&run_loop, project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.CreateAndShow(L"cronet_example", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + run_loop.Run(); + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/example/flutter/windows/runner/resource.h b/example/flutter/windows/runner/resource.h new file mode 100644 index 0000000..ddc7f3e --- /dev/null +++ b/example/flutter/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/example/flutter/windows/runner/resources/app_icon.ico b/example/flutter/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/example/flutter/windows/runner/run_loop.cpp b/example/flutter/windows/runner/run_loop.cpp new file mode 100644 index 0000000..0d91211 --- /dev/null +++ b/example/flutter/windows/runner/run_loop.cpp @@ -0,0 +1,66 @@ +#include "run_loop.h" + +#include + +#include + +RunLoop::RunLoop() {} + +RunLoop::~RunLoop() {} + +void RunLoop::Run() { + bool keep_running = true; + TimePoint next_flutter_event_time = TimePoint::clock::now(); + while (keep_running) { + std::chrono::nanoseconds wait_duration = + std::max(std::chrono::nanoseconds(0), + next_flutter_event_time - TimePoint::clock::now()); + ::MsgWaitForMultipleObjects( + 0, nullptr, FALSE, static_cast(wait_duration.count() / 1000), + QS_ALLINPUT); + bool processed_events = false; + MSG message; + // All pending Windows messages must be processed; MsgWaitForMultipleObjects + // won't return again for items left in the queue after PeekMessage. + while (::PeekMessage(&message, nullptr, 0, 0, PM_REMOVE)) { + processed_events = true; + if (message.message == WM_QUIT) { + keep_running = false; + break; + } + ::TranslateMessage(&message); + ::DispatchMessage(&message); + // Allow Flutter to process messages each time a Windows message is + // processed, to prevent starvation. + next_flutter_event_time = + std::min(next_flutter_event_time, ProcessFlutterMessages()); + } + // If the PeekMessage loop didn't run, process Flutter messages. + if (!processed_events) { + next_flutter_event_time = + std::min(next_flutter_event_time, ProcessFlutterMessages()); + } + } +} + +void RunLoop::RegisterFlutterInstance( + flutter::FlutterEngine* flutter_instance) { + flutter_instances_.insert(flutter_instance); +} + +void RunLoop::UnregisterFlutterInstance( + flutter::FlutterEngine* flutter_instance) { + flutter_instances_.erase(flutter_instance); +} + +RunLoop::TimePoint RunLoop::ProcessFlutterMessages() { + TimePoint next_event_time = TimePoint::max(); + for (auto instance : flutter_instances_) { + std::chrono::nanoseconds wait_duration = instance->ProcessMessages(); + if (wait_duration != std::chrono::nanoseconds::max()) { + next_event_time = + std::min(next_event_time, TimePoint::clock::now() + wait_duration); + } + } + return next_event_time; +} diff --git a/example/flutter/windows/runner/run_loop.h b/example/flutter/windows/runner/run_loop.h new file mode 100644 index 0000000..54927f9 --- /dev/null +++ b/example/flutter/windows/runner/run_loop.h @@ -0,0 +1,40 @@ +#ifndef RUNNER_RUN_LOOP_H_ +#define RUNNER_RUN_LOOP_H_ + +#include + +#include +#include + +// A runloop that will service events for Flutter instances as well +// as native messages. +class RunLoop { + public: + RunLoop(); + ~RunLoop(); + + // Prevent copying + RunLoop(RunLoop const&) = delete; + RunLoop& operator=(RunLoop const&) = delete; + + // Runs the run loop until the application quits. + void Run(); + + // Registers the given Flutter instance for event servicing. + void RegisterFlutterInstance( + flutter::FlutterEngine* flutter_instance); + + // Unregisters the given Flutter instance from event servicing. + void UnregisterFlutterInstance( + flutter::FlutterEngine* flutter_instance); + + private: + using TimePoint = std::chrono::steady_clock::time_point; + + // Processes all currently pending messages for registered Flutter instances. + TimePoint ProcessFlutterMessages(); + + std::set flutter_instances_; +}; + +#endif // RUNNER_RUN_LOOP_H_ diff --git a/example/flutter/windows/runner/runner.exe.manifest b/example/flutter/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..2c680b8 --- /dev/null +++ b/example/flutter/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/example/flutter/windows/runner/utils.cpp b/example/flutter/windows/runner/utils.cpp new file mode 100644 index 0000000..05b53c0 --- /dev/null +++ b/example/flutter/windows/runner/utils.cpp @@ -0,0 +1,64 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr); + if (target_length == 0) { + return std::string(); + } + std::string utf8_string; + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, utf8_string.data(), + target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/example/flutter/windows/runner/utils.h b/example/flutter/windows/runner/utils.h new file mode 100644 index 0000000..3f0e05c --- /dev/null +++ b/example/flutter/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/example/flutter/windows/runner/win32_window.cpp b/example/flutter/windows/runner/win32_window.cpp new file mode 100644 index 0000000..97f4439 --- /dev/null +++ b/example/flutter/windows/runner/win32_window.cpp @@ -0,0 +1,245 @@ +#include "win32_window.h" + +#include + +#include "resource.h" + +namespace { + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + FreeLibrary(user32_module); + } +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::CreateAndShow(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW | WS_VISIBLE, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + return OnCreate(); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} diff --git a/example/flutter/windows/runner/win32_window.h b/example/flutter/windows/runner/win32_window.h new file mode 100644 index 0000000..d9bcac1 --- /dev/null +++ b/example/flutter/windows/runner/win32_window.h @@ -0,0 +1,98 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates and shows a win32 window with |title| and position and size using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size to will treat the width height passed in to this function + // as logical pixels and scale to appropriate for the default monitor. Returns + // true if the window was created successfully. + bool CreateAndShow(const std::wstring& title, + const Point& origin, + const Size& size); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responsponds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ From bd49741df8b65c81ce1b791ed4cfb8d6c7f544f8 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 28 Jul 2021 12:30:32 +0530 Subject: [PATCH 07/22] update readme for android support --- README.md | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ad59d3..343f1cd 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,14 @@ This is a [GSoC 2021 project](https://summerofcode.withgoogle.com/projects/#4757 ## Supported Platforms -Currently, 64 bit Desktop Platforms (Linux, Windows and MacOS) are supported. +Currently, Android and 64 bit Desktop Platforms (Linux, Windows and MacOS) are supported. ## Requirements 1. Dart SDK 2.12.0 or above. 2. CMake 3.15 or above. (If on windows, Visual Studio 2019 with C++ tools) 3. C++ compiler. (g++/clang/msvc) +4. Android NDK if targeting Android. ## Usage @@ -27,6 +28,22 @@ Currently, 64 bit Desktop Platforms (Linux, Windows and MacOS) are supported. dart run cronet:setup # Downloads the cronet binaries. ``` + **Flutter** + + ```bash + flutter pub get + flutter run cronet:setup # Downloads the cronet binaries. + ``` + + ***Note for Android:** Remember to add the following permissions in `AndroidManifest.xml` file. + + ```xml + + + ``` + + You may also like to enable cleartext traffic by adding `android:usesCleartextTraffic="true"` to `AndroidManifest.xml` file. + 3. Import ```dart @@ -56,10 +73,20 @@ Currently, 64 bit Desktop Platforms (Linux, Windows and MacOS) are supported. ## Run Example +### Flutter + +```bash +cd example/flutter +flutter pub get +flutter run cronet:setup # Downloads the cronet binaries. +flutter run +``` + ### Dart CLI ```bash cd example/cli +dart pub get dart run cronet:setup # Downloads the cronet binaries. dart run ``` @@ -100,3 +127,5 @@ Note: Test results may get affected by: Date: Thu, 29 Jul 2021 17:16:18 +0530 Subject: [PATCH 08/22] str interpolate -> package:path join & adding constants --- bin/setup.dart | 53 ++++++++++++++++++++++-------------------- lib/src/constants.dart | 17 ++++++++++++++ tool/update_tars.dart | 39 +++++++++++++++++-------------- 3 files changed, 66 insertions(+), 43 deletions(-) diff --git a/bin/setup.dart b/bin/setup.dart index 5853db9..250de09 100644 --- a/bin/setup.dart +++ b/bin/setup.dart @@ -31,24 +31,21 @@ void extract(String fileName, [String dir = '']) { /// Places downloaded mobile binaries to proper location. void placeMobileBinaries(String platform, String fileName) { - final android = - '${findPackageRoot().toFilePath(windows: Platform.isWindows)}/android'; - Directory('$android/libs').createSync(); - Directory('$binaryStorageDir/$platform/libs').listSync().forEach((jar) { + Directory(androidPaths['cronet.jar']!).createSync(recursive: true); + Directory(tempAndroidDownloadPath['cronet.jar']!).listSync().forEach((jar) { if (jar is File) { - jar.renameSync('$android/libs/${basename(jar.path)}'); + jar.renameSync(join(androidPaths['cronet.jar']!, basename(jar.path))); } }); - Directory('$android/src/main/jniLibs').createSync(); - Directory('$binaryStorageDir/$platform/jniLibs') + Directory(androidPaths['cronet.so']!).createSync(recursive: true); + Directory(tempAndroidDownloadPath['cronet.so']!) .listSync(recursive: true) .forEach((cronet) { if (cronet is File) { - Directory('$android/src/main/jniLibs/${basename(cronet.parent.path)}') - .createSync(); - cronet.renameSync( - '$android/src/main/jniLibs/${basename(cronet.parent.path)}' - '/${basename(cronet.path)}'); + Directory(join(androidPaths['cronet.so']!, basename(cronet.parent.path))) + .createSync(recursive: true); + cronet.renameSync(join(androidPaths['cronet.so']!, + basename(cronet.parent.path), basename(cronet.path))); } }); } @@ -103,9 +100,10 @@ Future downloadCronetBinaries(String platform) async { String _makeBuildOutputPath(String buildFolderPath, String fileName, {bool isDebug = false}) { if (Platform.isWindows) { - return '$buildFolderPath\\out\\${Platform.operatingSystem}\\${isDebug ? "Debug" : "Release"}\\$fileName'; + return join(buildFolderPath, 'out', Platform.operatingSystem, + isDebug ? 'Debug' : 'Release', fileName); } else if (Platform.isMacOS || Platform.isLinux) { - return '$buildFolderPath/out/${Platform.operatingSystem}/$fileName'; + return join(buildFolderPath, 'out', Platform.operatingSystem, fileName); } else { throw Exception('Unsupported Platform.'); } @@ -123,7 +121,7 @@ void buildWrapper() { final result = Process.runSync('cmake', [ 'CMakeLists.txt', '-B', - 'out/${Platform.operatingSystem}', + join('out', Platform.operatingSystem), '-DCMAKE_BUILD_TYPE=Release' ]); print(result.stdout); @@ -139,8 +137,12 @@ void buildWrapper() { } return; } - var result = Process.runSync('cmake', - ['--build', 'out/${Platform.operatingSystem}', '--config', 'Release']); + var result = Process.runSync('cmake', [ + '--build', + join('out', Platform.operatingSystem), + '--config', + 'Release' + ]); print(result.stdout); print(result.stderr); if (result.exitCode != 0) return; @@ -148,7 +150,7 @@ void buildWrapper() { final moveLocation = '$binaryStorageDir${Platform.operatingSystem}64'; Directory(moveLocation).createSync(recursive: true); final buildOutputPath = _makeBuildOutputPath(wrapperPath, getWrapperName()); - File(buildOutputPath).copySync('$moveLocation/${getWrapperName()}'); + File(buildOutputPath).copySync(join(moveLocation, getWrapperName())); logger.stdout( '${ansi.green}Wrapper moved to $moveLocation. Success!${ansi.none}'); return; @@ -169,7 +171,7 @@ void verifyCronetBinary() { final logger = Logger.standard(); final ansi = Ansi(Ansi.terminalSupportsAnsi); final sampleSource = findPackageRoot() - .resolve('third_party/cronet_sample') + .resolve(join('third_party', 'cronet_sample')) .toFilePath(windows: Platform.isWindows); final buildName = _getCronetSampleBuildName(); final pwd = Directory.current; @@ -181,16 +183,16 @@ void verifyCronetBinary() { logger.stdout('Building Sample...'); var result = Process.runSync('cmake', [ - '$sampleSource/CMakeLists.txt', + join(sampleSource, 'CMakeLists.txt'), '-B', - '$sampleSource/out/${Platform.operatingSystem}' + join(sampleSource, 'out', Platform.operatingSystem) ], environment: { 'CURRENTDIR': pwd.path }); print(result.stdout); print(result.stderr); result = Process.runSync( - 'cmake', ['--build', '$sampleSource/out/${Platform.operatingSystem}'], + 'cmake', ['--build', join(sampleSource, 'out', Platform.operatingSystem)], environment: {'CURRENTDIR': pwd.path}); print(result.stdout); print(result.stderr); @@ -198,12 +200,13 @@ void verifyCronetBinary() { _makeBuildOutputPath(sampleSource, buildName, isDebug: true); logger.stdout('Copying...'); - final sample = File(buildOutputPath) - .copySync('.dart_tool/cronet/${Platform.operatingSystem}64/$buildName'); + final sample = File(buildOutputPath).copySync( + join('.dart_tool', 'cronet', Platform.operatingSystem + '64', buildName)); logger.stdout('Verifying...'); result = Process.runSync( - '.dart_tool/cronet/${Platform.operatingSystem}64/$buildName', []); + join('.dart_tool', 'cronet', Platform.operatingSystem + '64', buildName), + []); if (result.exitCode == 0) { logger.stdout('${ansi.green}Verified! Cronet is working fine.${ansi.none}'); } else { diff --git a/lib/src/constants.dart b/lib/src/constants.dart index c24c40b..08c59b8 100644 --- a/lib/src/constants.dart +++ b/lib/src/constants.dart @@ -4,6 +4,10 @@ import 'dart:io' show Platform; +import 'package:path/path.dart' as p; + +import 'third_party/ffigen/find_resource.dart'; + const desktopPlatforms = ['linux64', 'windows64', 'macos64']; const mobilePlatforms = ['android']; List get validPlatforms => desktopPlatforms + mobilePlatforms; @@ -15,6 +19,19 @@ const wrapperVersion = "1"; const binaryStorageDir = '.dart_tool/cronet/'; +// Contains paths where downloaded binaries are stored temporarily. +final tempAndroidDownloadPath = { + 'cronet.jar': p.join(binaryStorageDir, 'android', 'libs'), + 'cronet.so': p.join(binaryStorageDir, 'android', 'jniLibs') +}; + +// Contains paths where downloaded binaries are located for Android. +final androidRoot = p.fromUri(findPackageRoot().resolve('android')); +Map androidPaths = { + 'cronet.jar': p.join(androidPaths['root']!, 'libs'), + 'cronet.so': p.join(androidPaths['root']!, 'src', 'main', 'jniLibs') +}; + String getDylibName(String name, [String platform = '']) { var ext = '.so'; var prefix = 'lib'; diff --git a/tool/update_tars.dart b/tool/update_tars.dart index 802a19f..6f8d5b0 100644 --- a/tool/update_tars.dart +++ b/tool/update_tars.dart @@ -6,44 +6,47 @@ import 'dart:io'; import 'package:cronet/src/constants.dart'; -import 'package:cronet/src/third_party/ffigen/find_resource.dart'; import 'package:path/path.dart'; void main() { - Directory.current = Directory.current.uri.resolve('.dart_tool/cronet').path; + final pwd = Directory.current; + Directory.current = + Directory.current.uri.resolve(join('.dart_tool', 'cronet')).path; for (final platform in desktopPlatforms) { - if (File('$platform/${getCronetName(platform)}').existsSync()) { + if (File(join(platform, getCronetName(platform))).existsSync()) { final result = Process.runSync('tar', ['-czvf', '$platform.tar.gz', platform]); print(result.stdout); print(result.stderr); } else { - print( - '${getCronetName(platform)} not found in .dart_tool/cronet/$platform'); + print('${getCronetName(platform)} not found in' + + join('.dart_tool', 'cronet', platform)); } } // Make tarball for android releases. - final android = - '${findPackageRoot().toFilePath(windows: Platform.isWindows)}/android'; - if (!Directory('$android/libs').existsSync()) return; - Directory('android/libs').createSync(recursive: true); - Directory('$android/libs/').listSync().forEach((jar) { + Directory.current = pwd; + if (!Directory(androidPaths['cronet.jar']!).existsSync()) return; + Directory(tempAndroidDownloadPath['cronet.jar']!).createSync(recursive: true); + Directory(androidPaths['cronet.jar']!).listSync().forEach((jar) { if (jar is File) { - print(jar); - jar.copySync('android/libs/${basename(jar.path)}'); + jar.copySync( + join(tempAndroidDownloadPath['cronet.jar']!, basename(jar.path))); } }); - Directory('android/jniLibs').createSync(recursive: true); - Directory('$android/src/main/jniLibs/') + Directory(tempAndroidDownloadPath['cronet.so']!).createSync(recursive: true); + Directory(androidPaths['cronet.so']!) .listSync(recursive: true) .forEach((cronet) { if (cronet is File) { - print(cronet); - Directory('android/jniLibs/${basename(cronet.parent.path)}').createSync(); - cronet.copySync('android/jniLibs/${basename(cronet.parent.path)}' - '/${basename(cronet.path)}'); + Directory(join(tempAndroidDownloadPath['cronet.so']!, + basename(cronet.parent.path))) + .createSync(recursive: true); + cronet.copySync(join(tempAndroidDownloadPath['cronet.so']!, + basename(cronet.parent.path), basename(cronet.path))); } }); + Directory.current = + Directory.current.uri.resolve(join('.dart_tool', 'cronet')).path; final result = Process.runSync('tar', ['-czvf', 'android.tar.gz', 'android']); print(result.stdout); print(result.stderr); From a631548420891359409cadac02025ccba70f7987 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Thu, 29 Jul 2021 17:21:55 +0530 Subject: [PATCH 09/22] remove circular ref in map --- lib/src/constants.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/constants.dart b/lib/src/constants.dart index 08c59b8..c5deb2d 100644 --- a/lib/src/constants.dart +++ b/lib/src/constants.dart @@ -28,8 +28,8 @@ final tempAndroidDownloadPath = { // Contains paths where downloaded binaries are located for Android. final androidRoot = p.fromUri(findPackageRoot().resolve('android')); Map androidPaths = { - 'cronet.jar': p.join(androidPaths['root']!, 'libs'), - 'cronet.so': p.join(androidPaths['root']!, 'src', 'main', 'jniLibs') + 'cronet.jar': p.join(androidRoot, 'libs'), + 'cronet.so': p.join(androidRoot, 'src', 'main', 'jniLibs') }; String getDylibName(String name, [String platform = '']) { From 0488e0e8f3af68aba52b91397788e0777e4eaf51 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Thu, 29 Jul 2021 18:48:50 +0530 Subject: [PATCH 10/22] make androidPath final --- lib/src/constants.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/constants.dart b/lib/src/constants.dart index c5deb2d..3ead9de 100644 --- a/lib/src/constants.dart +++ b/lib/src/constants.dart @@ -27,7 +27,7 @@ final tempAndroidDownloadPath = { // Contains paths where downloaded binaries are located for Android. final androidRoot = p.fromUri(findPackageRoot().resolve('android')); -Map androidPaths = { +final androidPaths = { 'cronet.jar': p.join(androidRoot, 'libs'), 'cronet.so': p.join(androidRoot, 'src', 'main', 'jniLibs') }; From 2481e5439ba27c785acc2541b2a66224dfa7fa16 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Sun, 1 Aug 2021 14:32:55 +0530 Subject: [PATCH 11/22] add flutter platform keys for desktops --- .../flutter/generated_plugin_registrant.cc | 4 + .../linux/flutter/generated_plugins.cmake | 1 + .../flutter/generated_plugin_registrant.cc | 3 + .../windows/flutter/generated_plugins.cmake | 1 + linux/CMakeLists.txt | 25 ++++++ linux/cronet_plugin.cc | 70 ++++++++++++++++ linux/include/cronet/cronet_plugin.h | 26 ++++++ pubspec.yaml | 4 + windows/.gitignore | 17 ++++ windows/CMakeLists.txt | 24 ++++++ windows/cronet_plugin.cpp | 82 +++++++++++++++++++ windows/include/cronet/cronet_plugin.h | 23 ++++++ 12 files changed, 280 insertions(+) create mode 100644 linux/CMakeLists.txt create mode 100644 linux/cronet_plugin.cc create mode 100644 linux/include/cronet/cronet_plugin.h create mode 100644 windows/.gitignore create mode 100644 windows/CMakeLists.txt create mode 100644 windows/cronet_plugin.cpp create mode 100644 windows/include/cronet/cronet_plugin.h diff --git a/example/flutter/linux/flutter/generated_plugin_registrant.cc b/example/flutter/linux/flutter/generated_plugin_registrant.cc index d38195a..d53da08 100644 --- a/example/flutter/linux/flutter/generated_plugin_registrant.cc +++ b/example/flutter/linux/flutter/generated_plugin_registrant.cc @@ -4,6 +4,10 @@ #include "generated_plugin_registrant.h" +#include void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) cronet_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "CronetPlugin"); + cronet_plugin_register_with_registrar(cronet_registrar); } diff --git a/example/flutter/linux/flutter/generated_plugins.cmake b/example/flutter/linux/flutter/generated_plugins.cmake index 51436ae..6772a08 100644 --- a/example/flutter/linux/flutter/generated_plugins.cmake +++ b/example/flutter/linux/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + cronet ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/example/flutter/windows/flutter/generated_plugin_registrant.cc b/example/flutter/windows/flutter/generated_plugin_registrant.cc index 4bfa0f3..a76447e 100644 --- a/example/flutter/windows/flutter/generated_plugin_registrant.cc +++ b/example/flutter/windows/flutter/generated_plugin_registrant.cc @@ -4,6 +4,9 @@ #include "generated_plugin_registrant.h" +#include void RegisterPlugins(flutter::PluginRegistry* registry) { + CronetPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("CronetPlugin")); } diff --git a/example/flutter/windows/flutter/generated_plugins.cmake b/example/flutter/windows/flutter/generated_plugins.cmake index 4d10c25..2f82d2e 100644 --- a/example/flutter/windows/flutter/generated_plugins.cmake +++ b/example/flutter/windows/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + cronet ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt new file mode 100644 index 0000000..852294a --- /dev/null +++ b/linux/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.10) +set(PROJECT_NAME "cronet") +project(${PROJECT_NAME} LANGUAGES CXX) + +# This value is used when generating builds using this plugin, so it must +# not be changed +set(PLUGIN_NAME "cronet_plugin") + +add_library(${PLUGIN_NAME} SHARED + "cronet_plugin.cc" +) +apply_standard_settings(${PLUGIN_NAME}) +set_target_properties(${PLUGIN_NAME} PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) +target_include_directories(${PLUGIN_NAME} INTERFACE + "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(${PLUGIN_NAME} PRIVATE flutter) +target_link_libraries(${PLUGIN_NAME} PRIVATE PkgConfig::GTK) + +# List of absolute paths to libraries that should be bundled with the plugin +set(cronet_bundled_libraries + "" + PARENT_SCOPE +) diff --git a/linux/cronet_plugin.cc b/linux/cronet_plugin.cc new file mode 100644 index 0000000..1c726fe --- /dev/null +++ b/linux/cronet_plugin.cc @@ -0,0 +1,70 @@ +#include "include/cronet/cronet_plugin.h" + +#include +#include +#include + +#include + +#define CRONET_PLUGIN(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), cronet_plugin_get_type(), \ + CronetPlugin)) + +struct _CronetPlugin { + GObject parent_instance; +}; + +G_DEFINE_TYPE(CronetPlugin, cronet_plugin, g_object_get_type()) + +// Called when a method call is received from Flutter. +static void cronet_plugin_handle_method_call( + CronetPlugin* self, + FlMethodCall* method_call) { + g_autoptr(FlMethodResponse) response = nullptr; + + const gchar* method = fl_method_call_get_name(method_call); + + if (strcmp(method, "getPlatformVersion") == 0) { + struct utsname uname_data = {}; + uname(&uname_data); + g_autofree gchar *version = g_strdup_printf("Linux %s", uname_data.version); + g_autoptr(FlValue) result = fl_value_new_string(version); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(result)); + } else { + response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new()); + } + + fl_method_call_respond(method_call, response, nullptr); +} + +static void cronet_plugin_dispose(GObject* object) { + G_OBJECT_CLASS(cronet_plugin_parent_class)->dispose(object); +} + +static void cronet_plugin_class_init(CronetPluginClass* klass) { + G_OBJECT_CLASS(klass)->dispose = cronet_plugin_dispose; +} + +static void cronet_plugin_init(CronetPlugin* self) {} + +static void method_call_cb(FlMethodChannel* channel, FlMethodCall* method_call, + gpointer user_data) { + CronetPlugin* plugin = CRONET_PLUGIN(user_data); + cronet_plugin_handle_method_call(plugin, method_call); +} + +void cronet_plugin_register_with_registrar(FlPluginRegistrar* registrar) { + CronetPlugin* plugin = CRONET_PLUGIN( + g_object_new(cronet_plugin_get_type(), nullptr)); + + g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); + g_autoptr(FlMethodChannel) channel = + fl_method_channel_new(fl_plugin_registrar_get_messenger(registrar), + "cronet", + FL_METHOD_CODEC(codec)); + fl_method_channel_set_method_call_handler(channel, method_call_cb, + g_object_ref(plugin), + g_object_unref); + + g_object_unref(plugin); +} diff --git a/linux/include/cronet/cronet_plugin.h b/linux/include/cronet/cronet_plugin.h new file mode 100644 index 0000000..a67a851 --- /dev/null +++ b/linux/include/cronet/cronet_plugin.h @@ -0,0 +1,26 @@ +#ifndef FLUTTER_PLUGIN_CRONET_PLUGIN_H_ +#define FLUTTER_PLUGIN_CRONET_PLUGIN_H_ + +#include + +G_BEGIN_DECLS + +#ifdef FLUTTER_PLUGIN_IMPL +#define FLUTTER_PLUGIN_EXPORT __attribute__((visibility("default"))) +#else +#define FLUTTER_PLUGIN_EXPORT +#endif + +typedef struct _CronetPlugin CronetPlugin; +typedef struct { + GObjectClass parent_class; +} CronetPluginClass; + +FLUTTER_PLUGIN_EXPORT GType cronet_plugin_get_type(); + +FLUTTER_PLUGIN_EXPORT void cronet_plugin_register_with_registrar( + FlPluginRegistrar* registrar); + +G_END_DECLS + +#endif // FLUTTER_PLUGIN_CRONET_PLUGIN_H_ diff --git a/pubspec.yaml b/pubspec.yaml index 0721845..114b228 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,3 +29,7 @@ flutter: android: package: dev.google.cronet pluginClass: CronetPlugin + linux: + pluginClass: CronetPlugin + windows: + pluginClass: CronetPlugin diff --git a/windows/.gitignore b/windows/.gitignore new file mode 100644 index 0000000..808064a --- /dev/null +++ b/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt new file mode 100644 index 0000000..7bc570a --- /dev/null +++ b/windows/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.15) +set(PROJECT_NAME "cronet") +project(${PROJECT_NAME} LANGUAGES CXX) + +# This value is used when generating builds using this plugin, so it must +# not be changed +set(PLUGIN_NAME "cronet_plugin") + +add_library(${PLUGIN_NAME} SHARED + "cronet_plugin.cpp" +) +apply_standard_settings(${PLUGIN_NAME}) +set_target_properties(${PLUGIN_NAME} PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) +target_include_directories(${PLUGIN_NAME} INTERFACE + "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin) + +# List of absolute paths to libraries that should be bundled with the plugin +set(cronet_bundled_libraries + "" + PARENT_SCOPE +) diff --git a/windows/cronet_plugin.cpp b/windows/cronet_plugin.cpp new file mode 100644 index 0000000..ae44241 --- /dev/null +++ b/windows/cronet_plugin.cpp @@ -0,0 +1,82 @@ +#include "include/cronet/cronet_plugin.h" + +// This must be included before many other Windows headers. +#include + +// For getPlatformVersion; remove unless needed for your plugin implementation. +#include + +#include +#include +#include + +#include +#include +#include + +namespace { + +class CronetPlugin : public flutter::Plugin { + public: + static void RegisterWithRegistrar(flutter::PluginRegistrarWindows *registrar); + + CronetPlugin(); + + virtual ~CronetPlugin(); + + private: + // Called when a method is called on this plugin's channel from Dart. + void HandleMethodCall( + const flutter::MethodCall &method_call, + std::unique_ptr> result); +}; + +// static +void CronetPlugin::RegisterWithRegistrar( + flutter::PluginRegistrarWindows *registrar) { + auto channel = + std::make_unique>( + registrar->messenger(), "cronet", + &flutter::StandardMethodCodec::GetInstance()); + + auto plugin = std::make_unique(); + + channel->SetMethodCallHandler( + [plugin_pointer = plugin.get()](const auto &call, auto result) { + plugin_pointer->HandleMethodCall(call, std::move(result)); + }); + + registrar->AddPlugin(std::move(plugin)); +} + +CronetPlugin::CronetPlugin() {} + +CronetPlugin::~CronetPlugin() {} + +void CronetPlugin::HandleMethodCall( + const flutter::MethodCall &method_call, + std::unique_ptr> result) { + if (method_call.method_name().compare("getPlatformVersion") == 0) { + std::ostringstream version_stream; + version_stream << "Windows "; + if (IsWindows10OrGreater()) { + version_stream << "10+"; + } else if (IsWindows8OrGreater()) { + version_stream << "8"; + } else if (IsWindows7OrGreater()) { + version_stream << "7"; + } + result->Success(flutter::EncodableValue(version_stream.str())); + } else { + result->NotImplemented(); + } +} + +} // namespace + +void CronetPluginRegisterWithRegistrar( + FlutterDesktopPluginRegistrarRef registrar) { + CronetPlugin::RegisterWithRegistrar( + flutter::PluginRegistrarManager::GetInstance() + ->GetRegistrar(registrar)); +} diff --git a/windows/include/cronet/cronet_plugin.h b/windows/include/cronet/cronet_plugin.h new file mode 100644 index 0000000..05c3eb5 --- /dev/null +++ b/windows/include/cronet/cronet_plugin.h @@ -0,0 +1,23 @@ +#ifndef FLUTTER_PLUGIN_CRONET_PLUGIN_H_ +#define FLUTTER_PLUGIN_CRONET_PLUGIN_H_ + +#include + +#ifdef FLUTTER_PLUGIN_IMPL +#define FLUTTER_PLUGIN_EXPORT __declspec(dllexport) +#else +#define FLUTTER_PLUGIN_EXPORT __declspec(dllimport) +#endif + +#if defined(__cplusplus) +extern "C" { +#endif + +FLUTTER_PLUGIN_EXPORT void CronetPluginRegisterWithRegistrar( + FlutterDesktopPluginRegistrarRef registrar); + +#if defined(__cplusplus) +} // extern "C" +#endif + +#endif // FLUTTER_PLUGIN_CRONET_PLUGIN_H_ From e0bdfb8032e4e74910720145c9c8e5ab4cbb198d Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Mon, 2 Aug 2021 19:38:51 +0530 Subject: [PATCH 12/22] readme fixes and CI from Dart -> Flutter --- .github/workflows/test-package.yml | 12 +++++----- README.md | 35 ++++++++++++------------------ analysis_options.yaml | 1 - example/flutter/README.md | 18 ++++++++------- pubspec.yaml | 6 +++-- 5 files changed, 34 insertions(+), 38 deletions(-) diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index f6e2f26..8cf194f 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -32,12 +32,12 @@ jobs: sdk: ${{ matrix.sdk }} - id: install name: Install dependencies - run: dart pub get + run: flutter pub get - name: Check formatting - run: dart format --output=none --set-exit-if-changed . + run: flutter format --set-exit-if-changed . if: always() && steps.install.outcome == 'success' - name: Analyze code - run: dart analyze --fatal-infos + run: flutter analyze --fatal-infos if: always() && steps.install.outcome == 'success' # Run tests on a matrix consisting of two dimensions: @@ -59,10 +59,10 @@ jobs: sdk: ${{ matrix.sdk }} - id: install name: Install dependencies - run: dart pub get + run: flutter pub get - id: get_binaries name: Download/Build Cronet Binaries - run: dart run cronet:setup + run: flutter pub run cronet:setup - name: Run VM tests - run: dart test --platform vm + run: flutter test if: always() && steps.install.outcome == 'success' diff --git a/README.md b/README.md index 343f1cd..896ff0b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Currently, Android and 64 bit Desktop Platforms (Linux, Windows and MacOS) are s ## Requirements 1. Dart SDK 2.12.0 or above. -2. CMake 3.15 or above. (If on windows, Visual Studio 2019 with C++ tools) +2. CMake 3.10 or above. (If on windows, Visual Studio 2019 with C++ tools) 3. C++ compiler. (g++/clang/msvc) 4. Android NDK if targeting Android. @@ -21,28 +21,21 @@ Currently, Android and 64 bit Desktop Platforms (Linux, Windows and MacOS) are s 2. Run this from the `root` of your project. - **Dart CLI** - - ```bash - dart pub get - dart run cronet:setup # Downloads the cronet binaries. - ``` - - **Flutter** - ```bash flutter pub get - flutter run cronet:setup # Downloads the cronet binaries. + flutter pub run cronet:setup # Downloads the cronet binaries. ``` - ***Note for Android:** Remember to add the following permissions in `AndroidManifest.xml` file. + We need to use `flutter pub` even if we want to use it with Dart CLI. See for further details. + + ***Note for Android:** Remember to Add the following permissions in `AndroidManifest.xml` file. ```xml ``` - You may also like to enable cleartext traffic by adding `android:usesCleartextTraffic="true"` to `AndroidManifest.xml` file. + Optionally, enable cleartext traffic by adding `android:usesCleartextTraffic="true"` to `AndroidManifest.xml` file. 3. Import @@ -78,7 +71,7 @@ Currently, Android and 64 bit Desktop Platforms (Linux, Windows and MacOS) are s ```bash cd example/flutter flutter pub get -flutter run cronet:setup # Downloads the cronet binaries. +flutter pub run cronet:setup # Downloads the cronet binaries. flutter run ``` @@ -86,21 +79,21 @@ flutter run ```bash cd example/cli -dart pub get -dart run cronet:setup # Downloads the cronet binaries. -dart run +flutter pub get +flutter pub run cronet:setup # Downloads the cronet binaries. +dart run bin/example_dart.dart ``` ## Run Tests ```bash -dart pub get -dart run cronet:setup # Downloads the cronet binaries. -dart test --platform vm +flutter pub get +flutter pub run cronet:setup # Downloads the cronet binaries. +flutter test ``` You can also verify your cronet binaries using `dart run cronet:setup verify`. -Make sure to have `cmake 3.15`. +Make sure to have `cmake 3.10`. ## Benchmarking diff --git a/analysis_options.yaml b/analysis_options.yaml index 102b29b..3743f9b 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -5,7 +5,6 @@ include: package:lints/recommended.yaml analyzer: - exclude: [example/flutter/**] strong-mode: implicit-casts: false implicit-dynamic: false diff --git a/example/flutter/README.md b/example/flutter/README.md index ec2531b..d82f773 100644 --- a/example/flutter/README.md +++ b/example/flutter/README.md @@ -1,16 +1,18 @@ # cronet_example -A new Flutter project. +Example usage of package:cronet in Flutter apps. Fetches the page `http://info.cern.ch/` and displays it in screen along with Cronet version information and time taken to get the data. ## Getting Started -This project is a starting point for a Flutter application. +### Get the dependencies -A few resources to get you started if this is your first Flutter project: +```bash +flutter pub get +flutter pub run cronet:setup # Downloads the cronet binaries. +``` -- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) +### Run the app -For help getting started with Flutter, view our -[online documentation](https://flutter.dev/docs), which offers tutorials, -samples, guidance on mobile development, and a full API reference. +```bash +flutter run +``` diff --git a/pubspec.yaml b/pubspec.yaml index 114b228..ae510e4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,7 +9,7 @@ description: Experimental Cronet dart bindings. environment: sdk: '>=2.12.0 <3.0.0' - # flutter: '>=1.20.0' + flutter: '>=2.0.0' dependencies: ffi: ^1.1.2 @@ -21,7 +21,9 @@ dependencies: dev_dependencies: ffigen: ^2.4.2 lints: ^1.0.1 - test: ^1.17.5 + test: ^1.16.0 + flutter_test: + sdk: flutter flutter: plugin: From 3870e67c32c82f6307e631e4ff6a54e1d10884c0 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 4 Aug 2021 10:52:59 +0530 Subject: [PATCH 13/22] update ci --- .github/workflows/test-package.yml | 18 ++++++++++++------ README.md | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index 8cf194f..e564c8c 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -18,7 +18,7 @@ env: jobs: # Check code formatting and static analysis on a single OS (linux) - # against Dart stable. + # against Flutter stable. analyze: runs-on: ubuntu-latest strategy: @@ -27,9 +27,12 @@ jobs: sdk: [stable] steps: - uses: actions/checkout@v2 - - uses: dart-lang/setup-dart@v1.0 + - uses: actions/setup-java@v1 with: - sdk: ${{ matrix.sdk }} + java-version: '12.x' + - uses: subosito/flutter-action@v1 + with: + channel: ${{ matrix.sdk }} - id: install name: Install dependencies run: flutter pub get @@ -51,12 +54,15 @@ jobs: matrix: # Add macos-latest and/or windows-latest if relevant for this package. os: [ubuntu-latest, macos-latest, windows-latest] - sdk: [2.13.0, dev] + sdk: [stable, dev] steps: - uses: actions/checkout@v2 - - uses: dart-lang/setup-dart@v1.0 + - uses: actions/setup-java@v1 + with: + java-version: '12.x' + - uses: subosito/flutter-action@v1 with: - sdk: ${{ matrix.sdk }} + channel: ${{ matrix.sdk }} - id: install name: Install dependencies run: flutter pub get diff --git a/README.md b/README.md index 896ff0b..4b47342 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This is a [GSoC 2021 project](https://summerofcode.withgoogle.com/projects/#4757 ## Supported Platforms -Currently, Android and 64 bit Desktop Platforms (Linux, Windows and MacOS) are supported. +Currently, 64 bit Android and Desktop Platforms (Linux, Windows and MacOS) are supported. ## Requirements From 9fa832729b19d103b5694e478b5df2c804d88c4a Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 4 Aug 2021 10:57:13 +0530 Subject: [PATCH 14/22] remove boilerplate widget_test --- example/flutter/test/widget_test.dart | 30 --------------------------- 1 file changed, 30 deletions(-) delete mode 100644 example/flutter/test/widget_test.dart diff --git a/example/flutter/test/widget_test.dart b/example/flutter/test/widget_test.dart deleted file mode 100644 index 8217f0c..0000000 --- a/example/flutter/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility that Flutter provides. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:cronet_example/main.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(MyApp()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -} From edb24bd41c8a563f7b03e01e11873c3f37380023 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 4 Aug 2021 11:11:05 +0530 Subject: [PATCH 15/22] ci check success on each step --- .github/workflows/test-package.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index e564c8c..b343610 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -66,9 +66,11 @@ jobs: - id: install name: Install dependencies run: flutter pub get + if: always() && steps.install.outcome == 'success' - id: get_binaries name: Download/Build Cronet Binaries run: flutter pub run cronet:setup + if: always() && steps.install.outcome == 'success' - name: Run VM tests run: flutter test if: always() && steps.install.outcome == 'success' From 59da4ee0bc7c99402b6ba8f782d4fd5826cd55fd Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 4 Aug 2021 11:19:51 +0530 Subject: [PATCH 16/22] ci: remove successs check at wrong place --- .github/workflows/test-package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index b343610..49ef6d2 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -66,7 +66,6 @@ jobs: - id: install name: Install dependencies run: flutter pub get - if: always() && steps.install.outcome == 'success' - id: get_binaries name: Download/Build Cronet Binaries run: flutter pub run cronet:setup From 3adf06fde06ff58affc25ee7f72abce9dd969936 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 4 Aug 2021 11:35:50 +0530 Subject: [PATCH 17/22] change exit code in case of build failure --- bin/setup.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/setup.dart b/bin/setup.dart index 250de09..7c76fa1 100644 --- a/bin/setup.dart +++ b/bin/setup.dart @@ -145,7 +145,7 @@ void buildWrapper() { ]); print(result.stdout); print(result.stderr); - if (result.exitCode != 0) return; + if (result.exitCode != 0) exit(result.exitCode); Directory.current = pwd; final moveLocation = '$binaryStorageDir${Platform.operatingSystem}64'; Directory(moveLocation).createSync(recursive: true); From 3a4c1d704a28adfd8ba640fc8bd3678b5a98a76c Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 4 Aug 2021 15:20:42 +0530 Subject: [PATCH 18/22] remove linking with dart.lib (windows) and int -> size_t for strlen --- src/CMakeLists.txt | 5 ----- src/wrapper.cc | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 38d8e1e..8a76d9d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,11 +28,6 @@ target_include_directories(${PLUGIN_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/cronet" ) -if (WIN32) - set(DART_DIR "C:/tools/dart-sdk/bin") - find_library(DART_LIB dart.lib ${DART_DIR}) - target_link_libraries(${PLUGIN_NAME} PRIVATE ${DART_LIB}) -endif (WIN32) if (MSVC) set(MSVC_DISABLED_WARNINGS_LIST diff --git a/src/wrapper.cc b/src/wrapper.cc index a05a4a7..e78fc57 100644 --- a/src/wrapper.cc +++ b/src/wrapper.cc @@ -151,7 +151,7 @@ char *statusText(Cronet_UrlResponseInfoPtr info, int statusCode, int lBound, int uBound) { if (!(statusCode >= lBound && statusCode <= uBound)) { Cronet_String status = _Cronet_UrlResponseInfo_http_status_text_get(info); - int statusLen = strlen(status); + size_t statusLen = strlen(status); char *statusDup = (char *)malloc(statusLen + 1); memcpy(statusDup, status, statusLen + 1); return statusDup; @@ -186,7 +186,7 @@ void OnRedirectReceived(Cronet_UrlRequestCallbackPtr self, Cronet_UrlRequestPtr request, Cronet_UrlResponseInfoPtr info, Cronet_String newLocationUrl) { - int len = strlen(newLocationUrl); + size_t len = strlen(newLocationUrl); char *newLoc = (char *)malloc(len + 1); memcpy(newLoc, newLocationUrl, len + 1); int statusCode = _Cronet_UrlResponseInfo_http_status_code_get(info); @@ -231,7 +231,7 @@ void OnSucceeded(Cronet_UrlRequestCallbackPtr self, void OnFailed(Cronet_UrlRequestCallbackPtr self, Cronet_UrlRequestPtr request, Cronet_UrlResponseInfoPtr info, Cronet_ErrorPtr error) { Cronet_String errStr = _Cronet_Error_message_get(error); - int len = strlen(errStr); + size_t len = strlen(errStr); char *dupStr = (char *)malloc(len + 1); memcpy(dupStr, errStr, len + 1); DispatchCallback("OnFailed", request, CallbackArgBuilder(1, dupStr)); From 3dbaf296d1e369d1b6e25018895d92bbef807aff Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 4 Aug 2021 16:33:12 +0530 Subject: [PATCH 19/22] add `flutter create` boilerplate modification notes --- android/src/main/AndroidManifest.xml | 1 + example/flutter/android/app/src/main/AndroidManifest.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 32593b5..3dcf321 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ + diff --git a/example/flutter/android/app/src/main/AndroidManifest.xml b/example/flutter/android/app/src/main/AndroidManifest.xml index 59e3845..9695069 100644 --- a/example/flutter/android/app/src/main/AndroidManifest.xml +++ b/example/flutter/android/app/src/main/AndroidManifest.xml @@ -1,7 +1,9 @@ + + Date: Wed, 4 Aug 2021 16:43:44 +0530 Subject: [PATCH 20/22] Network -> network --- android/src/main/AndroidManifest.xml | 2 +- example/flutter/android/app/src/main/AndroidManifest.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 3dcf321..e63dc26 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + diff --git a/example/flutter/android/app/src/main/AndroidManifest.xml b/example/flutter/android/app/src/main/AndroidManifest.xml index 9695069..e4e0aec 100644 --- a/example/flutter/android/app/src/main/AndroidManifest.xml +++ b/example/flutter/android/app/src/main/AndroidManifest.xml @@ -1,9 +1,9 @@ - + - + Date: Wed, 4 Aug 2021 16:50:57 +0530 Subject: [PATCH 21/22] yet another typo :sweat: --- android/src/main/AndroidManifest.xml | 2 +- example/flutter/android/app/src/main/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index e63dc26..6d62a7b 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + diff --git a/example/flutter/android/app/src/main/AndroidManifest.xml b/example/flutter/android/app/src/main/AndroidManifest.xml index e4e0aec..30baccb 100644 --- a/example/flutter/android/app/src/main/AndroidManifest.xml +++ b/example/flutter/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + From 4cdcc6c3f87e4fc17aea3683caa79c119b64ffc5 Mon Sep 17 00:00:00 2001 From: Soumyadip Mondal Date: Wed, 4 Aug 2021 18:30:03 +0530 Subject: [PATCH 22/22] change download url --- lib/src/constants.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/constants.dart b/lib/src/constants.dart index 3ead9de..ae16135 100644 --- a/lib/src/constants.dart +++ b/lib/src/constants.dart @@ -13,7 +13,7 @@ const mobilePlatforms = ['android']; List get validPlatforms => desktopPlatforms + mobilePlatforms; const tag = 'binaries-v0.0.4'; const cronetBinaryUrl = - 'https://github.com/unsuitable001/cronet.dart/releases/download/$tag/'; + 'https://github.com/google/cronet.dart/releases/download/$tag/'; const cronetVersion = "86.0.4240.198"; const wrapperVersion = "1";