Revert Versions API (#7828)

* Revert "Fix versions implementation (#7726)"

This reverts commit 3c38dd34.

* Revert "Expose the Flutter engine, Dart and Skia versions to Dart. (#7634)"

This reverts commit b94e759b.

* remove namespace shell stuff

* fix format

* fix licenses

ci/licenses_golden/licenses_flutter

@@ -54,8 +54,6 @@ FILE: ../../../flutter/common/settings.cc
 FILE: ../../../flutter/common/settings.h
 FILE: ../../../flutter/common/task_runners.cc
 FILE: ../../../flutter/common/task_runners.h
-FILE: ../../../flutter/common/version/version.cc
-FILE: ../../../flutter/common/version/version.h
 FILE: ../../../flutter/flow/compositor_context.cc
 FILE: ../../../flutter/flow/compositor_context.h
 FILE: ../../../flutter/flow/debug_print.cc
@@ -360,9 +358,6 @@ FILE: ../../../flutter/lib/ui/text/text_box.h
 FILE: ../../../flutter/lib/ui/ui.dart
 FILE: ../../../flutter/lib/ui/ui_dart_state.cc
 FILE: ../../../flutter/lib/ui/ui_dart_state.h
-FILE: ../../../flutter/lib/ui/versions.cc
-FILE: ../../../flutter/lib/ui/versions.dart
-FILE: ../../../flutter/lib/ui/versions.h
 FILE: ../../../flutter/lib/ui/window.dart
 FILE: ../../../flutter/lib/ui/window/platform_message.cc
 FILE: ../../../flutter/lib/ui/window/platform_message.h
@@ -720,6 +715,8 @@ FILE: ../../../flutter/shell/platform/glfw/keyboard_hook_handler.h
 FILE: ../../../flutter/shell/platform/glfw/public/flutter_glfw.h
 FILE: ../../../flutter/shell/platform/glfw/text_input_plugin.cc
 FILE: ../../../flutter/shell/platform/glfw/text_input_plugin.h
+FILE: ../../../flutter/shell/version/version.cc
+FILE: ../../../flutter/shell/version/version.h
 FILE: ../../../flutter/sky/packages/flutter_services/lib/empty.dart
 FILE: ../../../flutter/sky/tools/roll/patches/chromium/android_build.patch
 FILE: ../../../flutter/third_party/txt/src/txt/platform.cc

lib/ui/BUILD.gn

@@ -81,8 +81,6 @@ source_set("ui") {
     "text/text_box.h",
     "ui_dart_state.cc",
     "ui_dart_state.h",
-    "versions.cc",
-    "versions.h",
     "window/platform_message.cc",
     "window/platform_message.h",
     "window/platform_message_response.cc",
@@ -104,7 +102,6 @@ source_set("ui") {
   deps = [
     "$flutter_root/assets",
     "$flutter_root/common",
-    "$flutter_root/common/version",
     "$flutter_root/flow",
     "$flutter_root/fml",
     "$flutter_root/runtime:test_font",

lib/ui/dart_ui.cc

@@ -27,7 +27,6 @@
 #include "flutter/lib/ui/text/font_collection.h"
 #include "flutter/lib/ui/text/paragraph.h"
 #include "flutter/lib/ui/text/paragraph_builder.h"
-#include "flutter/lib/ui/versions.h"
 #include "flutter/lib/ui/window/window.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/logging/dart_error.h"
@@ -91,7 +90,6 @@ void DartUI::InitForGlobal() {
     SceneBuilder::RegisterNatives(g_natives);
     SemanticsUpdate::RegisterNatives(g_natives);
     SemanticsUpdateBuilder::RegisterNatives(g_natives);
-    Versions::RegisterNatives(g_natives);
     Vertices::RegisterNatives(g_natives);
     Window::RegisterNatives(g_natives);
 #if defined(OS_FUCHSIA)

lib/ui/dart_ui.gni

@@ -16,7 +16,6 @@ dart_ui_files = [
   "$flutter_root/lib/ui/semantics.dart",
   "$flutter_root/lib/ui/text.dart",
   "$flutter_root/lib/ui/ui.dart",
-  "$flutter_root/lib/ui/versions.dart",
   "$flutter_root/lib/ui/window.dart",
 ]
 

lib/ui/ui.dart

@@ -34,5 +34,4 @@ part 'plugins.dart';
 part 'pointer.dart';
 part 'semantics.dart';
 part 'text.dart';
-part 'versions.dart';
 part 'window.dart';

lib/ui/versions.cc

-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/lib/ui/versions.h"
-#include "flutter/common/version/version.h"
-#include "third_party/tonic/converter/dart_converter.h"
-#include "third_party/tonic/dart_library_natives.h"
-
-#include <string>
-#include <vector>
-
-using tonic::DartConverter;
-
-namespace flutter {
-
-// returns a vector with 3 versions.
-// Dart, Skia and Flutter engine versions in this order.
-void GetVersions(Dart_NativeArguments args) {
-  const std::vector<std::string> versions_list = {
-      GetDartVersion(), GetSkiaVersion(), GetFlutterEngineVersion()};
-  Dart_Handle dart_val =
-      DartConverter<std::vector<std::string>>::ToDart(versions_list);
-  Dart_SetReturnValue(args, dart_val);
-}
-
-void Versions::RegisterNatives(tonic::DartLibraryNatives* natives) {
-  natives->Register({{"Versions_getVersions", GetVersions, 0, true}});
-}
-
-}  // namespace flutter

lib/ui/versions.dart

-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-part of dart.ui;
-
-/// Wraps version information for Dart, Skia and Flutter.
-class Versions {
-
-  /// Builds a versions object using the information
-  /// we get from calling the native getVersions.
-  factory Versions._internal() {
-    final List<String> versions = _getVersions();
-    return Versions._(versions[0], versions[1], versions[2]);
-  }
-
-  /// Private constructor to capture the versions.
-  Versions._(
-    this.dartVersion,
-    this.skiaVersion,
-    this.flutterEngineVersion
-  ) : assert(dartVersion != null),
-      assert(skiaVersion != null),
-      assert(flutterEngineVersion != null);
-
-  /// returns a vector with 3 versions.
-  /// Dart, Skia and Flutter engine versions in this order.
-  static List<String> _getVersions() native 'Versions_getVersions';
-
-  final String dartVersion;
-  final String skiaVersion;
-  final String flutterEngineVersion;
-}
-
-/// [Versions] singleton. This object exposes Dart, Skia and
-/// Flutter engine versions.
-final Versions versions = Versions._internal();

lib/ui/versions.h

-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_LIB_UI_VERSIONS_H_
-#define FLUTTER_LIB_UI_VERSIONS_H_
-
-namespace tonic {
-class DartLibraryNatives;
-}  // namespace tonic
-
-namespace flutter {
-
-class Versions final {
- public:
-  static void RegisterNatives(tonic::DartLibraryNatives* natives);
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_LIB_UI_VERSIONS_H_

shell/common/BUILD.gn

@@ -106,7 +106,7 @@ source_set("common") {
   ]
 
   public_deps = [
-    "$flutter_root/common/version",
+    "$flutter_root/shell/version",
     "$flutter_root/third_party/txt",
     "//third_party/rapidjson",
     "//third_party/tonic",

shell/common/engine.cc

@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "flutter/common/settings.h"
-#include "flutter/common/version/version.h"
 #include "flutter/fml/eintr_wrapper.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/make_copyable.h"

shell/common/persistent_cache.cc

@@ -7,13 +7,13 @@
 #include <memory>
 #include <string>
 
-#include "flutter/common/version/version.h"
 #include "flutter/fml/base32.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/paths.h"
 #include "flutter/fml/trace_event.h"
+#include "flutter/shell/version/version.h"
 
 namespace flutter {
 

shell/common/switches.cc

@@ -9,10 +9,10 @@
 #include <sstream>
 #include <string>
 
-#include "flutter/common/version/version.h"
 #include "flutter/fml/native_library.h"
 #include "flutter/fml/paths.h"
 #include "flutter/fml/string_view.h"
+#include "flutter/shell/version/version.h"
 
 // Include once for the default enum definition.
 #include "flutter/shell/common/switches.h"

common/version/version.cc → shell/version/version.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/common/version/version.h"
+#include "flutter/shell/version/version.h"
 
 namespace flutter {
 

common/version/version.h → shell/version/version.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_COMMON_VERSION_VERSION_H_
-#define FLUTTER_COMMON_VERSION_VERSION_H_
+#ifndef FLUTTER_SHELL_COMMON_VERSION_H_
+#define FLUTTER_SHELL_COMMON_VERSION_H_
 
 namespace flutter {
 
@@ -15,4 +15,4 @@ const char* GetDartVersion();
 
 }  // namespace flutter
 
-#endif  // FLUTTER_COMMON_VERSION_VERSION_H_
+#endif  // FLUTTER_SHELL_COMMON_VERSION_H_

testing/dart/versions_test.dart

-// Copyright 2013 The Flutter Authors. 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:ui';
-
-import 'package:test/test.dart';
-
-bool _isNotEmpty(String s) {
-  if (s == null || s.isEmpty) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-void main() {
-  test('dartVersion should not be empty', () {
-    final String dartVersion = versions.dartVersion;
-    expect(_isNotEmpty(dartVersion), equals(true));
-  });
-
-  test('skiaVersion should not be empty', () {
-    final String skiaVersion = versions.skiaVersion;
-    expect(_isNotEmpty(skiaVersion), equals(true));
-  });
-
-  test('flutterEngineVersion should not be empty', () {
-    final String flutterEngineVersion = versions.flutterEngineVersion;
-    expect(_isNotEmpty(flutterEngineVersion), equals(true));
-  });
-}