From c5e1bd792b1646ccc781c064efd47c08d45a2749 Mon Sep 17 00:00:00 2001 From: Bin <17426470+boyan01@users.noreply.github.com> Date: Fri, 24 Nov 2023 11:30:20 +0800 Subject: [PATCH] [mixin_logger] fix not working on android (#303) * [mixin_logger] fix not working on android * bump version --- packages/mixin_logger/.metadata | 23 ++++-- packages/mixin_logger/CHANGELOG.md | 4 ++ packages/mixin_logger/android/.gitignore | 9 +++ packages/mixin_logger/android/build.gradle | 65 +++++++++++++++++ packages/mixin_logger/android/settings.gradle | 1 + .../android/src/main/AndroidManifest.xml | 3 + .../mixin_logger/example/android/.gitignore | 13 ++++ .../example/android/app/build.gradle | 67 ++++++++++++++++++ .../android/app/src/debug/AndroidManifest.xml | 7 ++ .../android/app/src/main/AndroidManifest.xml | 44 ++++++++++++ .../mixin_logger_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 ++ .../mixin_logger/example/android/build.gradle | 31 ++++++++ .../example/android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 5 ++ .../example/android/settings.gradle | 25 +++++++ packages/mixin_logger/example/pubspec.lock | 31 +++++++- packages/mixin_logger/pubspec.yaml | 4 +- 27 files changed, 397 insertions(+), 11 deletions(-) create mode 100644 packages/mixin_logger/android/.gitignore create mode 100644 packages/mixin_logger/android/build.gradle create mode 100644 packages/mixin_logger/android/settings.gradle create mode 100644 packages/mixin_logger/android/src/main/AndroidManifest.xml create mode 100644 packages/mixin_logger/example/android/.gitignore create mode 100644 packages/mixin_logger/example/android/app/build.gradle create mode 100644 packages/mixin_logger/example/android/app/src/debug/AndroidManifest.xml create mode 100644 packages/mixin_logger/example/android/app/src/main/AndroidManifest.xml create mode 100644 packages/mixin_logger/example/android/app/src/main/kotlin/com/example/mixin_logger_example/MainActivity.kt create mode 100644 packages/mixin_logger/example/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 packages/mixin_logger/example/android/app/src/main/res/drawable/launch_background.xml create mode 100644 packages/mixin_logger/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 packages/mixin_logger/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 packages/mixin_logger/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 packages/mixin_logger/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 packages/mixin_logger/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 packages/mixin_logger/example/android/app/src/main/res/values-night/styles.xml create mode 100644 packages/mixin_logger/example/android/app/src/main/res/values/styles.xml create mode 100644 packages/mixin_logger/example/android/app/src/profile/AndroidManifest.xml create mode 100644 packages/mixin_logger/example/android/build.gradle create mode 100644 packages/mixin_logger/example/android/gradle.properties create mode 100644 packages/mixin_logger/example/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 packages/mixin_logger/example/android/settings.gradle diff --git a/packages/mixin_logger/.metadata b/packages/mixin_logger/.metadata index b328e137..5d8c8cbc 100644 --- a/packages/mixin_logger/.metadata +++ b/packages/mixin_logger/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "48f08e3db23f14e41051d672ed3da1bc65caa87d" + revision: "0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2" channel: "master" project_type: plugin_ffi @@ -13,14 +13,23 @@ project_type: plugin_ffi migration: platforms: - platform: root - create_revision: 48f08e3db23f14e41051d672ed3da1bc65caa87d - base_revision: 48f08e3db23f14e41051d672ed3da1bc65caa87d + create_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 + base_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 + - platform: android + create_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 + base_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 - platform: ios - create_revision: 48f08e3db23f14e41051d672ed3da1bc65caa87d - base_revision: 48f08e3db23f14e41051d672ed3da1bc65caa87d + create_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 + base_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 + - platform: linux + create_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 + base_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 - platform: macos - create_revision: 48f08e3db23f14e41051d672ed3da1bc65caa87d - base_revision: 48f08e3db23f14e41051d672ed3da1bc65caa87d + create_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 + base_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 + - platform: windows + create_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 + base_revision: 0858ea2ce8f8c6a4d8732d7f1fc50af2f98877a2 # User provided section diff --git a/packages/mixin_logger/CHANGELOG.md b/packages/mixin_logger/CHANGELOG.md index 5296599a..26cb09ec 100644 --- a/packages/mixin_logger/CHANGELOG.md +++ b/packages/mixin_logger/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.1 + +* add android support. + ## 0.1.0 * refactor implementation to c++, works on Windows/Linux/macOS/iOS. diff --git a/packages/mixin_logger/android/.gitignore b/packages/mixin_logger/android/.gitignore new file mode 100644 index 00000000..161bdcda --- /dev/null +++ b/packages/mixin_logger/android/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.cxx diff --git a/packages/mixin_logger/android/build.gradle b/packages/mixin_logger/android/build.gradle new file mode 100644 index 00000000..3f027277 --- /dev/null +++ b/packages/mixin_logger/android/build.gradle @@ -0,0 +1,65 @@ +// The Android Gradle Plugin builds the native code with the Android NDK. + +group 'one.mixin.mixin_logger' +version '1.0' + +buildscript { + repositories { + google() + mavenCentral() + } + + dependencies { + // The Android Gradle Plugin knows how to build native code with the NDK. + classpath 'com.android.tools.build:gradle:7.3.0' + } +} + +rootProject.allprojects { + repositories { + google() + mavenCentral() + } +} + +apply plugin: 'com.android.library' + +android { + if (project.android.hasProperty("namespace")) { + namespace 'com.example.mixin_logger' + } + + // Bumping the plugin compileSdk version requires all clients of this plugin + // to bump the version in their app. + compileSdk 34 + + // Use the NDK version + // declared in /android/app/build.gradle file of the Flutter project. + // Replace it with a version number if this plugin requires a specfic NDK version. + // (e.g. ndkVersion "23.1.7779620") + ndkVersion android.ndkVersion + + // Invoke the shared CMake build with the Android Gradle Plugin. + externalNativeBuild { + cmake { + path "../src/CMakeLists.txt" + + // The default CMake version for the Android Gradle Plugin is 3.10.2. + // https://developer.android.com/studio/projects/install-ndk#vanilla_cmake + // + // The Flutter tooling requires that developers have CMake 3.10 or later + // installed. You should not increase this version, as doing so will cause + // the plugin to fail to compile for some customers of the plugin. + // version "3.10.2" + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + defaultConfig { + minSdkVersion 19 + } +} diff --git a/packages/mixin_logger/android/settings.gradle b/packages/mixin_logger/android/settings.gradle new file mode 100644 index 00000000..10bcaff8 --- /dev/null +++ b/packages/mixin_logger/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'mixin_logger' diff --git a/packages/mixin_logger/android/src/main/AndroidManifest.xml b/packages/mixin_logger/android/src/main/AndroidManifest.xml new file mode 100644 index 00000000..0c222294 --- /dev/null +++ b/packages/mixin_logger/android/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/packages/mixin_logger/example/android/.gitignore b/packages/mixin_logger/example/android/.gitignore new file mode 100644 index 00000000..6f568019 --- /dev/null +++ b/packages/mixin_logger/example/android/.gitignore @@ -0,0 +1,13 @@ +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 +**/*.keystore +**/*.jks diff --git a/packages/mixin_logger/example/android/app/build.gradle b/packages/mixin_logger/example/android/app/build.gradle new file mode 100644 index 00000000..98c1ef17 --- /dev/null +++ b/packages/mixin_logger/example/android/app/build.gradle @@ -0,0 +1,67 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +android { + namespace "com.example.mixin_logger_example" + compileSdk flutter.compileSdkVersion + ndkVersion flutter.ndkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.example.mixin_logger_example" + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + minSdkVersion flutter.minSdkVersion + targetSdkVersion flutter.targetSdkVersion + 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 {} diff --git a/packages/mixin_logger/example/android/app/src/debug/AndroidManifest.xml b/packages/mixin_logger/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..399f6981 --- /dev/null +++ b/packages/mixin_logger/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/mixin_logger/example/android/app/src/main/AndroidManifest.xml b/packages/mixin_logger/example/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..b8396161 --- /dev/null +++ b/packages/mixin_logger/example/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/mixin_logger/example/android/app/src/main/kotlin/com/example/mixin_logger_example/MainActivity.kt b/packages/mixin_logger/example/android/app/src/main/kotlin/com/example/mixin_logger_example/MainActivity.kt new file mode 100644 index 00000000..97a4a733 --- /dev/null +++ b/packages/mixin_logger/example/android/app/src/main/kotlin/com/example/mixin_logger_example/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.mixin_logger_example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/packages/mixin_logger/example/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/mixin_logger/example/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 00000000..f74085f3 --- /dev/null +++ b/packages/mixin_logger/example/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/mixin_logger/example/android/app/src/main/res/drawable/launch_background.xml b/packages/mixin_logger/example/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 00000000..304732f8 --- /dev/null +++ b/packages/mixin_logger/example/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/mixin_logger/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/mixin_logger/example/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/packages/mixin_logger/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/mixin_logger/example/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/packages/mixin_logger/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/mixin_logger/example/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/packages/mixin_logger/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/mixin_logger/example/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/packages/mixin_logger/example/android/app/src/main/res/values-night/styles.xml b/packages/mixin_logger/example/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 00000000..06952be7 --- /dev/null +++ b/packages/mixin_logger/example/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/mixin_logger/example/android/app/src/main/res/values/styles.xml b/packages/mixin_logger/example/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..cb1ef880 --- /dev/null +++ b/packages/mixin_logger/example/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/mixin_logger/example/android/app/src/profile/AndroidManifest.xml b/packages/mixin_logger/example/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 00000000..399f6981 --- /dev/null +++ b/packages/mixin_logger/example/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/mixin_logger/example/android/build.gradle b/packages/mixin_logger/example/android/build.gradle new file mode 100644 index 00000000..b3a090a2 --- /dev/null +++ b/packages/mixin_logger/example/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.7.10' + repositories { + google() + mavenCentral() + } + + dependencies { + // AGP version is set in settings.gradle. + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +tasks.register("clean", Delete) { + delete rootProject.buildDir +} diff --git a/packages/mixin_logger/example/android/gradle.properties b/packages/mixin_logger/example/android/gradle.properties new file mode 100644 index 00000000..598d13fe --- /dev/null +++ b/packages/mixin_logger/example/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx4G +android.useAndroidX=true +android.enableJetifier=true diff --git a/packages/mixin_logger/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/mixin_logger/example/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..3c472b99 --- /dev/null +++ b/packages/mixin_logger/example/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-7.5-all.zip diff --git a/packages/mixin_logger/example/android/settings.gradle b/packages/mixin_logger/example/android/settings.gradle new file mode 100644 index 00000000..0d47ff5e --- /dev/null +++ b/packages/mixin_logger/example/android/settings.gradle @@ -0,0 +1,25 @@ +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() + + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.3.0" apply false +} + +include ":app" diff --git a/packages/mixin_logger/example/pubspec.lock b/packages/mixin_logger/example/pubspec.lock index 0d74a8d6..9947f964 100644 --- a/packages/mixin_logger/example/pubspec.lock +++ b/packages/mixin_logger/example/pubspec.lock @@ -91,6 +91,22 @@ packages: description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "04be76c4a4bb50f14904e64749237e541e7c7bcf7ec0b196907322ab5d2fc739" + url: "https://pub.dev" + source: hosted + version: "9.0.16" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: b06739349ec2477e943055aea30172c5c7000225f79dad4702e2ec0eda79a6ff + url: "https://pub.dev" + source: hosted + version: "1.0.5" lints: dependency: transitive description: @@ -129,7 +145,7 @@ packages: path: ".." relative: true source: path - version: "0.2.0" + version: "0.1.1" path: dependency: "direct main" description: @@ -199,13 +215,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" web: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.4.0" sdks: dart: ">=3.2.0-194.0.dev <4.0.0" + flutter: ">=2.0.0" diff --git a/packages/mixin_logger/pubspec.yaml b/packages/mixin_logger/pubspec.yaml index 3baee8cd..e8a15a65 100644 --- a/packages/mixin_logger/pubspec.yaml +++ b/packages/mixin_logger/pubspec.yaml @@ -1,6 +1,6 @@ name: mixin_logger description: Simple logger tool for flutter, make it easy to save your app log to file. -version: 0.1.0 +version: 0.1.1 homepage: https://github.com/MixinNetwork/flutter-plugins environment: @@ -32,4 +32,6 @@ flutter: macos: ffiPlugin: true windows: + ffiPlugin: true + android: ffiPlugin: true \ No newline at end of file