From e4c0a96adc3d605ecd9dbf2d951e51c4ac0fb410 Mon Sep 17 00:00:00 2001 From: jan francis tagadiad Date: Thu, 8 Oct 2020 14:57:46 +0800 Subject: [PATCH 1/3] fix deprecated --- .dart_tool/package_config.json | 56 +++++++ example/.dart_tool/package_config.json | 151 ++++++++++++++++++ example/.flutter-plugins-dependencies | 1 + .../ios/Flutter/flutter_export_environment.sh | 15 ++ .../lib/conversation/conversationStore.dart | 2 +- example/lib/sim/sim_bloc_provider.dart | 2 +- 6 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 .dart_tool/package_config.json create mode 100644 example/.dart_tool/package_config.json create mode 100644 example/.flutter-plugins-dependencies create mode 100644 example/ios/Flutter/flutter_export_environment.sh diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json new file mode 100644 index 0000000..6ff1146 --- /dev/null +++ b/.dart_tool/package_config.json @@ -0,0 +1,56 @@ +{ + "configVersion": 2, + "packages": [ + { + "name": "characters", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/characters-1.1.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "collection", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/collection-1.15.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "flutter", + "rootUri": "file:///C:/flutter/packages/flutter", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "meta", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/meta-1.3.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "sky_engine", + "rootUri": "file:///C:/flutter/bin/cache/pkg/sky_engine", + "packageUri": "lib/", + "languageVersion": "1.11" + }, + { + "name": "typed_data", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.3.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "vector_math", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/vector_math-2.1.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "sms_maintained", + "rootUri": "../", + "packageUri": "lib/", + "languageVersion": "1.19" + } + ], + "generated": "2020-10-08T06:24:06.517185Z", + "generator": "pub", + "generatorVersion": "2.10.0" +} diff --git a/example/.dart_tool/package_config.json b/example/.dart_tool/package_config.json new file mode 100644 index 0000000..781a51f --- /dev/null +++ b/example/.dart_tool/package_config.json @@ -0,0 +1,151 @@ +{ + "configVersion": 2, + "packages": [ + { + "name": "async", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/async-2.5.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "boolean_selector", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-2.1.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "characters", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/characters-1.1.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "charcode", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/charcode-1.2.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "clock", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/clock-1.1.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "collection", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/collection-1.15.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "cupertino_icons", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "fake_async", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/fake_async-1.2.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "flutter", + "rootUri": "file:///C:/flutter/packages/flutter", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "flutter_test", + "rootUri": "file:///C:/flutter/packages/flutter_test", + "packageUri": "lib/", + "languageVersion": "2.2" + }, + { + "name": "matcher", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.10-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "meta", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/meta-1.3.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "path", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/path-1.8.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "sky_engine", + "rootUri": "file:///C:/flutter/bin/cache/pkg/sky_engine", + "packageUri": "lib/", + "languageVersion": "1.11" + }, + { + "name": "sms_maintained", + "rootUri": "../../", + "packageUri": "lib/", + "languageVersion": "1.19" + }, + { + "name": "source_span", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/source_span-1.8.0-nullsafety.2", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "stack_trace", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.10.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "stream_channel", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/stream_channel-2.1.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "string_scanner", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.1.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "term_glyph", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.2.0-nullsafety.1", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "test_api", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/test_api-0.2.19-nullsafety.2", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "typed_data", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.3.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "vector_math", + "rootUri": "file:///C:/Users/janfr/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/vector_math-2.1.0-nullsafety.3", + "packageUri": "lib/", + "languageVersion": "2.10" + }, + { + "name": "sms_example", + "rootUri": "../", + "packageUri": "lib/" + } + ], + "generated": "2020-10-08T06:24:10.614122Z", + "generator": "pub", + "generatorVersion": "2.10.0" +} diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies new file mode 100644 index 0000000..9dfec2d --- /dev/null +++ b/example/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sms_maintained","path":"D:\\\\Projects\\\\Github\\\\flutter_sms\\\\","dependencies":[]}],"android":[{"name":"sms_maintained","path":"D:\\\\Projects\\\\Github\\\\flutter_sms\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sms_maintained","dependencies":[]}],"date_created":"2020-10-08 14:24:10.729812","version":"1.22.0"} \ No newline at end of file diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh new file mode 100644 index 0000000..0353394 --- /dev/null +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=C:\flutter" +export "FLUTTER_APPLICATION_PATH=D:\Projects\Github\flutter_sms\example" +export "FLUTTER_TARGET=lib\main.dart" +export "FLUTTER_BUILD_DIR=build" +export "SYMROOT=${SOURCE_ROOT}/../build\ios" +export "OTHER_LDFLAGS=$(inherited) -framework Flutter" +export "FLUTTER_FRAMEWORK_DIR=C:\flutter\bin\cache\artifacts\engine\ios" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=false" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.packages" diff --git a/example/lib/conversation/conversationStore.dart b/example/lib/conversation/conversationStore.dart index 42cda0b..bd60702 100644 --- a/example/lib/conversation/conversationStore.dart +++ b/example/lib/conversation/conversationStore.dart @@ -10,7 +10,7 @@ class ConversationStore extends InheritedWidget { final SmsThread thread; static ConversationStore of(BuildContext context) { - return context.inheritFromWidgetOfExactType(ConversationStore) + return context.dependOnInheritedWidgetOfExactType() as ConversationStore; } diff --git a/example/lib/sim/sim_bloc_provider.dart b/example/lib/sim/sim_bloc_provider.dart index 4ccfb6e..bac4d1c 100644 --- a/example/lib/sim/sim_bloc_provider.dart +++ b/example/lib/sim/sim_bloc_provider.dart @@ -9,7 +9,7 @@ class SimCardsBlocProvider extends InheritedWidget { final SimCardsBloc simCardBloc; static SimCardsBloc of(BuildContext context) { - final provider = context.inheritFromWidgetOfExactType(SimCardsBlocProvider); + final provider = context.dependOnInheritedWidgetOfExactType(); if (provider != null) { return (provider as SimCardsBlocProvider).simCardBloc; } From 9b9aa14f585743e6ee3c238ab777291281800c31 Mon Sep 17 00:00:00 2001 From: jan francis tagadiad Date: Fri, 9 Oct 2020 16:56:34 +0800 Subject: [PATCH 2/3] update --- android/.settings/org.eclipse.buildship.core.prefs | 13 ++++++++++++- .../babariviere/sms/telephony/TelephonyManager.java | 5 +++++ example/android/app/build.gradle | 2 +- example/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs index 6aa97a9..c8259ec 100644 --- a/android/.settings/org.eclipse.buildship.core.prefs +++ b/android/.settings/org.eclipse.buildship.core.prefs @@ -1,2 +1,13 @@ -connection.project.dir=../example/android +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3)) +connection.project.dir= eclipse.preferences.version=1 +gradle.user.home= +java.home=C\:/Program Files/Java/jdk-15 +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/android/src/main/java/com/babariviere/sms/telephony/TelephonyManager.java b/android/src/main/java/com/babariviere/sms/telephony/TelephonyManager.java index 9ea8736..69ab4b4 100644 --- a/android/src/main/java/com/babariviere/sms/telephony/TelephonyManager.java +++ b/android/src/main/java/com/babariviere/sms/telephony/TelephonyManager.java @@ -4,6 +4,8 @@ import android.content.Context; import android.os.Build; +import androidx.annotation.RequiresApi; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -21,7 +23,10 @@ public int getSimCount() { return this.getManager().getPhoneCount(); } + @RequiresApi(api = Build.VERSION_CODES.M) public String getSimId(int slotId) { + + return this.getManager().getDeviceId(slotId); } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 18a2863..1538879 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -24,7 +24,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.babariviere.smsexample" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 28 versionCode 1 versionName "1.0" diff --git a/example/android/build.gradle b/example/android/build.gradle index 541636c..6bc1cb8 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:4.0.2' } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 1878b36..29a03bc 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Aug 07 11:59:14 CEST 2018 +#Thu Oct 08 15:17:23 SGT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip From b56edb89b32188ccefb3fd24dfeea57d8aec44dd Mon Sep 17 00:00:00 2001 From: jan francis tagadiad Date: Fri, 9 Oct 2020 16:57:35 +0800 Subject: [PATCH 3/3] update --- .../.settings/org.eclipse.buildship.core.prefs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/example/android/.settings/org.eclipse.buildship.core.prefs b/example/android/.settings/org.eclipse.buildship.core.prefs index e889521..5912c46 100644 --- a/example/android/.settings/org.eclipse.buildship.core.prefs +++ b/example/android/.settings/org.eclipse.buildship.core.prefs @@ -1,2 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 +gradle.user.home= +java.home=C\:/Program Files/Java/jdk-15 +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true