Skip to content

Commit 54043d8

Browse files
FarjanaParveenFarjanaParveen
authored
Merge pull request #4 from abineshPalanisamy/Time-format
KB sample Dependent bot changes
2 parents b417727 + 6b8723a commit 54043d8

37 files changed

+979
-508
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ migrate_working_dir/
2727
.dart_tool/
2828
.flutter-plugins
2929
.flutter-plugins-dependencies
30-
.packages
3130
.pub-cache/
3231
.pub/
3332
/build/

‎android/app/build.gradle‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
1617
flutterVersionCode = '1'
@@ -21,13 +22,9 @@ if (flutterVersionName == null) {
2122
flutterVersionName = '1.0'
2223
}
2324

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
2825
android {
2926
namespace "com.example.flutter_application"
30-
compileSdkVersion flutter.compileSdkVersion
27+
compileSdk flutter.compileSdkVersion
3128
ndkVersion flutter.ndkVersion
3229

3330
compileOptions {
@@ -67,6 +64,4 @@ flutter {
6764
source '../..'
6865
}
6966

70-
dependencies {
71-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
72-
}
67+
dependencies {}

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,15 @@
3030
android:name="flutterEmbedding"
3131
android:value="2" />
3232
</application>
33+
<!-- Required to query activities that can process text, see:
34+
https://developer.android.com/training/package-visibility?hl=en and
35+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
36+
37+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
38+
<queries>
39+
<intent>
40+
<action android:name="android.intent.action.PROCESS_TEXT"/>
41+
<data android:mimeType="text/plain"/>
42+
</intent>
43+
</queries>
3344
</manifest>

‎android/app/src/main/kotlin/com/example/flutter_application/MainActivity.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package com.example.flutter_application
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity: FlutterActivity()

‎android/build.gradle‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.7.10'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.3.0'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()

‎android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4G
22
android.useAndroidX=true
33
android.enableJetifier=true

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

‎android/settings.gradle‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}
9+
settings.ext.flutterSdkPath = flutterSdkPath()
210

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
11+
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
512

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
13+
repositories {
14+
google()
15+
mavenCentral()
16+
gradlePluginPortal()
17+
}
18+
}
819

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
20+
plugins {
21+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
22+
id "com.android.application" version "7.3.0" apply false
23+
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
24+
}
25+
26+
include ":app"

‎ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11+
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
1112
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1213
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
1314
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1415
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1516
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16-
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
1717
/* End PBXBuildFile section */
1818

1919
/* Begin PBXContainerItemProxy section */
@@ -42,6 +42,8 @@
4242
/* Begin PBXFileReference section */
4343
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4444
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
45+
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
46+
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4547
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4648
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4749
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -53,8 +55,6 @@
5355
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5456
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5557
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
56-
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
57-
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5858
/* End PBXFileReference section */
5959

6060
/* Begin PBXFrameworksBuildPhase section */
@@ -68,6 +68,14 @@
6868
/* End PBXFrameworksBuildPhase section */
6969

7070
/* Begin PBXGroup section */
71+
331C8082294A63A400263BE5 /* RunnerTests */ = {
72+
isa = PBXGroup;
73+
children = (
74+
331C807B294A618700263BE5 /* RunnerTests.swift */,
75+
);
76+
path = RunnerTests;
77+
sourceTree = "<group>";
78+
};
7179
9740EEB11CF90186004384FC /* Flutter */ = {
7280
isa = PBXGroup;
7381
children = (
@@ -79,14 +87,6 @@
7987
name = Flutter;
8088
sourceTree = "<group>";
8189
};
82-
331C8082294A63A400263BE5 /* RunnerTests */ = {
83-
isa = PBXGroup;
84-
children = (
85-
331C807B294A618700263BE5 /* RunnerTests.swift */,
86-
);
87-
path = RunnerTests;
88-
sourceTree = "<group>";
89-
};
9090
97C146E51CF9000F007C117D = {
9191
isa = PBXGroup;
9292
children = (
@@ -129,7 +129,6 @@
129129
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
130130
buildPhases = (
131131
331C807D294A63A400263BE5 /* Sources */,
132-
331C807E294A63A400263BE5 /* Frameworks */,
133132
331C807F294A63A400263BE5 /* Resources */,
134133
);
135134
buildRules = (
@@ -168,7 +167,8 @@
168167
97C146E61CF9000F007C117D /* Project object */ = {
169168
isa = PBXProject;
170169
attributes = {
171-
LastUpgradeCheck = 1300;
170+
BuildIndependentTargetsInParallel = YES;
171+
LastUpgradeCheck = 1510;
172172
ORGANIZATIONNAME = "";
173173
TargetAttributes = {
174174
331C8080294A63A400263BE5 = {
@@ -307,6 +307,7 @@
307307
isa = XCBuildConfiguration;
308308
buildSettings = {
309309
ALWAYS_SEARCH_USER_PATHS = NO;
310+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
310311
CLANG_ANALYZER_NONNULL = YES;
311312
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
312313
CLANG_CXX_LIBRARY = "libc++";
@@ -336,6 +337,7 @@
336337
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
337338
ENABLE_NS_ASSERTIONS = NO;
338339
ENABLE_STRICT_OBJC_MSGSEND = YES;
340+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
339341
GCC_C_LANGUAGE_STANDARD = gnu99;
340342
GCC_NO_COMMON_BLOCKS = YES;
341343
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -344,7 +346,7 @@
344346
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
345347
GCC_WARN_UNUSED_FUNCTION = YES;
346348
GCC_WARN_UNUSED_VARIABLE = YES;
347-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
349+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
348350
MTL_ENABLE_DEBUG_INFO = NO;
349351
SDKROOT = iphoneos;
350352
SUPPORTED_PLATFORMS = iphoneos;
@@ -376,7 +378,6 @@
376378
};
377379
331C8088294A63A400263BE5 /* Debug */ = {
378380
isa = XCBuildConfiguration;
379-
baseConfigurationReference = AE0B7B92F70575B8D7E0D07E /* Pods-RunnerTests.debug.xcconfig */;
380381
buildSettings = {
381382
BUNDLE_LOADER = "$(TEST_HOST)";
382383
CODE_SIGN_STYLE = Automatic;
@@ -394,7 +395,6 @@
394395
};
395396
331C8089294A63A400263BE5 /* Release */ = {
396397
isa = XCBuildConfiguration;
397-
baseConfigurationReference = 89B67EB44CE7B6631473024E /* Pods-RunnerTests.release.xcconfig */;
398398
buildSettings = {
399399
BUNDLE_LOADER = "$(TEST_HOST)";
400400
CODE_SIGN_STYLE = Automatic;
@@ -410,7 +410,6 @@
410410
};
411411
331C808A294A63A400263BE5 /* Profile */ = {
412412
isa = XCBuildConfiguration;
413-
baseConfigurationReference = 640959BDD8F10B91D80A66BE /* Pods-RunnerTests.profile.xcconfig */;
414413
buildSettings = {
415414
BUNDLE_LOADER = "$(TEST_HOST)";
416415
CODE_SIGN_STYLE = Automatic;
@@ -428,6 +427,7 @@
428427
isa = XCBuildConfiguration;
429428
buildSettings = {
430429
ALWAYS_SEARCH_USER_PATHS = NO;
430+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
431431
CLANG_ANALYZER_NONNULL = YES;
432432
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
433433
CLANG_CXX_LIBRARY = "libc++";
@@ -457,6 +457,7 @@
457457
DEBUG_INFORMATION_FORMAT = dwarf;
458458
ENABLE_STRICT_OBJC_MSGSEND = YES;
459459
ENABLE_TESTABILITY = YES;
460+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
460461
GCC_C_LANGUAGE_STANDARD = gnu99;
461462
GCC_DYNAMIC_NO_PIC = NO;
462463
GCC_NO_COMMON_BLOCKS = YES;
@@ -471,7 +472,7 @@
471472
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
472473
GCC_WARN_UNUSED_FUNCTION = YES;
473474
GCC_WARN_UNUSED_VARIABLE = YES;
474-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
475+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
475476
MTL_ENABLE_DEBUG_INFO = YES;
476477
ONLY_ACTIVE_ARCH = YES;
477478
SDKROOT = iphoneos;
@@ -483,6 +484,7 @@
483484
isa = XCBuildConfiguration;
484485
buildSettings = {
485486
ALWAYS_SEARCH_USER_PATHS = NO;
487+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
486488
CLANG_ANALYZER_NONNULL = YES;
487489
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
488490
CLANG_CXX_LIBRARY = "libc++";
@@ -512,6 +514,7 @@
512514
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
513515
ENABLE_NS_ASSERTIONS = NO;
514516
ENABLE_STRICT_OBJC_MSGSEND = YES;
517+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
515518
GCC_C_LANGUAGE_STANDARD = gnu99;
516519
GCC_NO_COMMON_BLOCKS = YES;
517520
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -520,7 +523,7 @@
520523
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
521524
GCC_WARN_UNUSED_FUNCTION = YES;
522525
GCC_WARN_UNUSED_VARIABLE = YES;
523-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
526+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
524527
MTL_ENABLE_DEBUG_INFO = NO;
525528
SDKROOT = iphoneos;
526529
SUPPORTED_PLATFORMS = iphoneos;

0 commit comments

Comments
 (0)