Android: Replace Qt snapshot maven, with release maven repo

This change replaces the 0.1 SNAPSHOT versions with
1.+ version which means 1.0 and above.

We should also remove Qt maven repository URL so the
plugin can be fetched from mavenCentral.

Task-number: QTBUG-128417
Pick-to: 6.8
Change-Id: Id1006b64f6bf3f0d13d03a4f26b441236aa77cc7
Reviewed-by: Assam Boudjelthia <[email protected]>
Reviewed-by: Rami Potinkara <[email protected]>

10 files changed, 5 insertions, 20 deletions

diff --git a/examples/platforms/android/models/qtabstractitemmodel_java/app/build.gradle b/examples/platforms/android/models/qtabstractitemmodel_java/app/build.gradle
index a09f285600..e2e42de298 100644
--- a/examples/platforms/android/models/qtabstractitemmodel_java/app/build.gradle
+++ b/examples/platforms/android/models/qtabstractitemmodel_java/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.application'
-    id 'org.qtproject.qt.gradleplugin' version '0.1-SNAPSHOT+'
+    id 'org.qtproject.qt.gradleplugin' version '1.+'
  }
 
  QtBuild {
diff --git a/examples/platforms/android/models/qtabstractitemmodel_java/settings.gradle b/examples/platforms/android/models/qtabstractitemmodel_java/settings.gradle
index 53265ea289..e584f4a5e4 100644
--- a/examples/platforms/android/models/qtabstractitemmodel_java/settings.gradle
+++ b/examples/platforms/android/models/qtabstractitemmodel_java/settings.gradle
@@ -10,9 +10,6 @@ pluginManagement {
         }
         mavenCentral()
         gradlePluginPortal()
-        maven  {
-            url "https://android.qt.io/maven/snapshots"
-        }
      }
 }
 dependencyResolutionManagement {
diff --git a/examples/platforms/android/models/qtabstractlistmodel_kotlin/app/build.gradle.kts b/examples/platforms/android/models/qtabstractlistmodel_kotlin/app/build.gradle.kts
index fd9a667b0e..b30c5fa11e 100644
--- a/examples/platforms/android/models/qtabstractlistmodel_kotlin/app/build.gradle.kts
+++ b/examples/platforms/android/models/qtabstractlistmodel_kotlin/app/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    id("org.qtproject.qt.gradleplugin") version "0.1-SNAPSHOT+"
+    id("org.qtproject.qt.gradleplugin") version "1.+"
 }
 
 //! [build.gradle QtBuild config]
diff --git a/examples/platforms/android/models/qtabstractlistmodel_kotlin/settings.gradle.kts b/examples/platforms/android/models/qtabstractlistmodel_kotlin/settings.gradle.kts
index 401b9c6173..f61b3e380c 100644
--- a/examples/platforms/android/models/qtabstractlistmodel_kotlin/settings.gradle.kts
+++ b/examples/platforms/android/models/qtabstractlistmodel_kotlin/settings.gradle.kts
@@ -8,9 +8,6 @@ pluginManagement {
             }
         }
         mavenCentral()
-        maven {
-            url = uri("https://android.qt.io/maven/snapshots")
-        }
         gradlePluginPortal()
     }
 }
diff --git a/examples/platforms/android/qtquickview_java/app/build.gradle b/examples/platforms/android/qtquickview_java/app/build.gradle
index 928898af07..41f355ca3b 100644
--- a/examples/platforms/android/qtquickview_java/app/build.gradle
+++ b/examples/platforms/android/qtquickview_java/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.application'
-    id 'org.qtproject.qt.gradleplugin' version '0.1-SNAPSHOT+'
+    id 'org.qtproject.qt.gradleplugin' version '1.+'
  }
 
  QtBuild {
diff --git a/examples/platforms/android/qtquickview_java/settings.gradle b/examples/platforms/android/qtquickview_java/settings.gradle
index e0d524176f..179ddf7436 100644
--- a/examples/platforms/android/qtquickview_java/settings.gradle
+++ b/examples/platforms/android/qtquickview_java/settings.gradle
@@ -3,9 +3,6 @@ pluginManagement {
         google()
         mavenCentral()
         gradlePluginPortal()
-        maven {
-            url "https://android.qt.io/maven/snapshots"
-        }
      }
 }
 
diff --git a/examples/platforms/android/qtquickview_kotlin/app/build.gradle.kts b/examples/platforms/android/qtquickview_kotlin/app/build.gradle.kts
index 37ea5b53cc..e24e67e807 100644
--- a/examples/platforms/android/qtquickview_kotlin/app/build.gradle.kts
+++ b/examples/platforms/android/qtquickview_kotlin/app/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    id("org.qtproject.qt.gradleplugin") version "0.1-SNAPSHOT+"
+    id("org.qtproject.qt.gradleplugin") version "1.+"
 }
 
 QtBuild {
diff --git a/examples/platforms/android/qtquickview_kotlin/settings.gradle.kts b/examples/platforms/android/qtquickview_kotlin/settings.gradle.kts
index 367d0585df..90fd588393 100644
--- a/examples/platforms/android/qtquickview_kotlin/settings.gradle.kts
+++ b/examples/platforms/android/qtquickview_kotlin/settings.gradle.kts
@@ -3,9 +3,6 @@ pluginManagement {
         google()
         mavenCentral()
         gradlePluginPortal()
-        maven {
-            url = uri("https://android.qt.io/maven/snapshots")
-        }
     }
 }
 dependencyResolutionManagement {
diff --git a/tests/manual/platforms/android/qtquickview_java/app/build.gradle b/tests/manual/platforms/android/qtquickview_java/app/build.gradle
index 211fdd0584..1f7a0e2932 100644
--- a/tests/manual/platforms/android/qtquickview_java/app/build.gradle
+++ b/tests/manual/platforms/android/qtquickview_java/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.application'
-    id 'org.qtproject.qt.gradleplugin' version '0.1-SNAPSHOT+'
+    id 'org.qtproject.qt.gradleplugin' version '1.+'
 }
 
 def qtBuildPropertiesFile = rootProject.file('qtbuild.properties');
diff --git a/tests/manual/platforms/android/qtquickview_java/settings.gradle b/tests/manual/platforms/android/qtquickview_java/settings.gradle
index 76a9a990cc..315684e585 100644
--- a/tests/manual/platforms/android/qtquickview_java/settings.gradle
+++ b/tests/manual/platforms/android/qtquickview_java/settings.gradle
@@ -2,9 +2,6 @@ pluginManagement {
     repositories {
         google()
         mavenCentral()
-        maven {
-            url "https://android.qt.io/maven/snapshots"
-        }
         gradlePluginPortal()
     }
 }