diff --git a/.ci.yaml b/.ci.yaml index a920ab83a766b..fc281a1b14e9d 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -10,6 +10,7 @@ enabled_branches: - dev - beta - stable + - flutter-2.6-candidate.11 platform_properties: linux: diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 704dc7c5b10c9..1cd44364bb34b 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:7.0.0" @@ -10,7 +10,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } apply plugin: "com.android.library" diff --git a/shell/platform/darwin/ios/framework/Info.plist b/shell/platform/darwin/ios/framework/Info.plist index 420e8034b9277..7264dec38d4ef 100644 --- a/shell/platform/darwin/ios/framework/Info.plist +++ b/shell/platform/darwin/ios/framework/Info.plist @@ -21,7 +21,7 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 FlutterEngine {0} ClangVersion diff --git a/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.mm b/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.mm index ad5dd0d19def6..2bdde791c62ca 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.mm @@ -106,33 +106,4 @@ - (NSInteger)accessibilityElementCount { return [[_semanticsObject children] count]; } -- (id)accessibilityElementAtIndex:(NSInteger)index { - SemanticsObject* child = [_semanticsObject children][index]; - - // Swap the original `SemanticsObject` to a `PlatformViewSemanticsContainer` - if (child.node.IsPlatformViewNode()) { - child.platformViewSemanticsContainer.index = index; - return child.platformViewSemanticsContainer; - } - - if ([child hasChildren]) - return [child accessibilityContainer]; - return [child nativeAccessibility]; -} - -- (NSInteger)indexOfAccessibilityElement:(id)element { - if ([element isKindOfClass:[FlutterPlatformViewSemanticsContainer class]]) { - return ((FlutterPlatformViewSemanticsContainer*)element).index; - } - - NSArray* children = [_semanticsObject children]; - for (size_t i = 0; i < [children count]; i++) { - SemanticsObject* child = children[i]; - if ((![child hasChildren] && child == element) || - ([child hasChildren] && [child accessibilityContainer] == element)) - return i; - } - return NSNotFound; -} - @end diff --git a/testing/android_background_image/android/build.gradle b/testing/android_background_image/android/build.gradle index bfe1241ab2439..51b93f95dc279 100644 --- a/testing/android_background_image/android/build.gradle +++ b/testing/android_background_image/android/build.gradle @@ -3,7 +3,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:7.0.0' @@ -16,7 +16,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/testing/scenario_app/android/build.gradle b/testing/scenario_app/android/build.gradle index 2308fb2bf6422..007f63430020b 100644 --- a/testing/scenario_app/android/build.gradle +++ b/testing/scenario_app/android/build.gradle @@ -3,7 +3,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:7.0.0' @@ -23,7 +23,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/tools/cipd/android_embedding_bundle/build.gradle b/tools/cipd/android_embedding_bundle/build.gradle index e93098cf2ed7e..6c255757f9b96 100644 --- a/tools/cipd/android_embedding_bundle/build.gradle +++ b/tools/cipd/android_embedding_bundle/build.gradle @@ -12,7 +12,7 @@ def destinationDir = "lib" buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:3.5.0" @@ -22,7 +22,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } }