v.next versioning (#423)

Changing versioning so old versions can still be imported.

Author: anmacdonald

uitools/README.md

@@ -1,5 +1,3 @@
-# Prototype repo for new qt toolkit
-
 ## Introduction
 
 This toolkit is an open source resource intended for use with the ArcGIS Runtime

uitools/import/Esri/ArcGISRuntime/Toolkit/Controller/CurrentVersion.qml

@@ -0,0 +1,25 @@
+/*******************************************************************************
+ *  Copyright 2012-2021 Esri
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ ******************************************************************************/
+
+import QtQml 2.12
+
+/*!
+  \internal
+  This QML file is only used for incrementing the current version of the toolkit and
+  should not be used in your application.
+*/
+
+QtObject {}

uitools/import/Esri/ArcGISRuntime/Toolkit/Controller/esri_arcgisruntime_toolkit_controller.qrc

@@ -7,6 +7,7 @@
       <file>CoordinateConversionController.qml</file>
       <file>CoordinateConversionOption.qml</file>
       <file>CoordinateConversionResult.qml</file>
+      <file>CurrentVersion.qml</file>
       <file>NorthArrowController.qml</file>
       <file>PopupViewController.qml</file>
       <file>TimeSliderController.qml</file>

uitools/import/Esri/ArcGISRuntime/Toolkit/Controller/qmldir

@@ -13,13 +13,15 @@
 # limitations under the License.
 
 module Esri.ArcGISRuntime.Toolkit.Controller
+# Current version increment
+CurrentVersion 100.12 CurrentVersion.qml
 # Controller components
-AuthenticationController 100.12 AuthenticationController.qml
+AuthenticationController 100.10 AuthenticationController.qml
 BasemapGalleryController 100.12 BasemapGalleryController.qml
 BasemapGalleryItem 100.12 BasemapGalleryItem.qml
-CoordinateConversionController 100.12 CoordinateConversionController.qml
-CoordinateConversionOption 100.12 CoordinateConversionOption.qml
-CoordinateConversionResult 100.12 CoordinateConversionResult.qml
-NorthArrowController 100.12 NorthArrowController.qml
-PopupViewController 100.12 PopupViewController.qml
-TimeSliderController 100.12 TimeSliderController.qml
+CoordinateConversionController 100.10 CoordinateConversionController.qml
+CoordinateConversionOption 100.10 CoordinateConversionOption.qml
+CoordinateConversionResult 100.10 CoordinateConversionResult.qml
+NorthArrowController 100.10 NorthArrowController.qml
+PopupViewController 100.10 PopupViewController.qml
+TimeSliderController 100.10 TimeSliderController.qml

uitools/import/Esri/ArcGISRuntime/Toolkit/CurrentVersion.qml

@@ -0,0 +1,25 @@
+/*******************************************************************************
+ *  Copyright 2012-2021 Esri
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ ******************************************************************************/
+
+import QtQml 2.12
+
+/*!
+  \internal
+  This QML file is only used for incrementing the current version of the toolkit and
+  should not be used in your application.
+*/
+
+QtObject {}

uitools/import/Esri/ArcGISRuntime/Toolkit/esri_arcgisruntime_toolkit_view.qrc

@@ -6,6 +6,7 @@
     <file>Callout.qml</file>
     <file>ClientCertificateView.qml</file>
     <file>CoordinateConversion.qml</file>
+    <file>CurrentVersion.qml</file>
     <file>FlashImage.qml</file>
     <file>LeaderPosition.js</file>
     <file>NorthArrow.qml</file>

uitools/import/Esri/ArcGISRuntime/Toolkit/qmldir

@@ -16,18 +16,21 @@ module Esri.ArcGISRuntime.Toolkit
 
 depends Esri.ArcGISRuntime.Toolkit.Controller 100.12
 
+# Current version increment
+CurrentVersion 100.12 CurrentVersion.qml
+
 # View components
-AuthenticationView 100.12 AuthenticationView.qml
+AuthenticationView 100.10 AuthenticationView.qml
 BasemapGallery 100.12 BasemapGallery.qml
-Callout 100.12 Callout.qml
-ClientCertificateView 100.12 ClientCertificateView.qml
-CoordinateConversion 100.12 CoordinateConversion.qml
+Callout 100.10 Callout.qml
+ClientCertificateView 100.10 ClientCertificateView.qml
+CoordinateConversion 100.10 CoordinateConversion.qml
 internal FlashImage FlashImage.qml
-LeaderPosition 100.12 LeaderPosition.js
-NorthArrow 100.12 NorthArrow.qml
-OAuth2View 100.12 OAuth2View.qml
-PopupStackView 100.12 PopupStackView.qml
-PopupView 100.12 PopupView.qml
-SslHandshakeView 100.12 SslHandshakeView.qml
-TimeSlider 100.12 TimeSlider.qml
-UserCredentialsView 100.12 UserCredentialsView.qml
+LeaderPosition 100.10 LeaderPosition.js
+NorthArrow 100.10 NorthArrow.qml
+OAuth2View 100.10 OAuth2View.qml
+PopupStackView 100.10 PopupStackView.qml
+PopupView 100.10 PopupView.qml
+SslHandshakeView 100.10 SslHandshakeView.qml
+TimeSlider 100.10 TimeSlider.qml
+UserCredentialsView 100.10 UserCredentialsView.qml

uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp

@@ -66,15 +66,28 @@ constexpr int VERSION_MINOR = 12;
  
  \list
   \li \c T Type to register in QML.
+  \li \a minorVersion The version at which the component was created.
  \endlist
  */
 template <typename T>
-void registerComponent()
+void registerComponent(int minorVersion)
 {
   static_assert(std::is_base_of<QObject, T>::value, "Must inherit QObject");
   auto name = QString{T::staticMetaObject.className()};
   name.remove("Esri::ArcGISRuntime::Toolkit::");
-  qmlRegisterType<T>(NAMESPACE, VERSION_MAJOR, VERSION_MINOR, name.toLatin1());
+  qmlRegisterType<T>(NAMESPACE, VERSION_MAJOR, minorVersion, name.toLatin1());
+}
+
+/*
+ \internal
+ \brief Ensures a Module revision is available from 100.10 onwards 
+ to the current version of the Toolkit.
+ */
+void registerModuleRevisions()
+{
+  constexpr int START_VERSION = 10;
+  for (int i = START_VERSION; i <= VERSION_MINOR; ++i)
+    qmlRegisterModule(NAMESPACE, VERSION_MAJOR, i);
 }
 
 } // namespace
@@ -83,15 +96,16 @@ void registerComponents_cpp_(QQmlEngine& appEngine)
 {
   appEngine.addImageProvider(BasemapGalleryImageProvider::PROVIDER_ID, BasemapGalleryImageProvider::instance());
   appEngine.addImportPath(ESRI_COM_PATH);
-  registerComponent<AuthenticationController>();
-  registerComponent<BasemapGalleryController>();
-  registerComponent<BasemapGalleryItem>();
-  registerComponent<CoordinateConversionController>();
-  registerComponent<CoordinateConversionOption>();
-  registerComponent<CoordinateConversionResult>();
-  registerComponent<NorthArrowController>();
-  registerComponent<PopupViewController>();
-  registerComponent<TimeSliderController>();
+  registerModuleRevisions();
+  registerComponent<AuthenticationController>(10);
+  registerComponent<BasemapGalleryController>(12);
+  registerComponent<BasemapGalleryItem>(12);
+  registerComponent<CoordinateConversionController>(10);
+  registerComponent<CoordinateConversionOption>(10);
+  registerComponent<CoordinateConversionResult>(10);
+  registerComponent<NorthArrowController>(10);
+  registerComponent<PopupViewController>(10);
+  registerComponent<TimeSliderController>(10);
 
   qRegisterMetaType<Point>("Esri::ArcGISRuntime::Point");
 }