From c69cdbc97d27d20590167e4d6839f276dce79f39 Mon Sep 17 00:00:00 2001
From: Igor Demin <igordmn@users.noreply.github.com>
Date: Wed, 13 Sep 2023 21:11:05 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20Failed=20to=20apply=20plugin=20class=20?=
 =?UTF-8?q?=E2=80=98org.gradle.toolchains.foojay.FoojayToolchainsPlugin?=
 =?UTF-8?q?=E2=80=99.=20(#3677)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_PublishFast_4ValidateTemplatesTutorials/4312787?hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildChangesSection=true&expandBuildProblemsSection=true
---
 ci/templates/multiplatform-template/android/build.gradle.kts   | 1 +
 .../android/src/main/AndroidManifest.xml                       | 3 +--
 ci/templates/multiplatform-template/common/build.gradle.kts    | 1 +
 .../gradle/wrapper/gradle-wrapper.properties                   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/templates/multiplatform-template/android/build.gradle.kts b/ci/templates/multiplatform-template/android/build.gradle.kts
index 93c11c5f271..5ab7ec6f521 100644
--- a/ci/templates/multiplatform-template/android/build.gradle.kts
+++ b/ci/templates/multiplatform-template/android/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 
 android {
     compileSdk = 34
+    namespace = "com.myapplication"
 
     defaultConfig {
         minSdk = 26
diff --git a/ci/templates/multiplatform-template/android/src/main/AndroidManifest.xml b/ci/templates/multiplatform-template/android/src/main/AndroidManifest.xml
index 8a21a189257..bc7e8616968 100644
--- a/ci/templates/multiplatform-template/android/src/main/AndroidManifest.xml
+++ b/ci/templates/multiplatform-template/android/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.myapplication">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/ci/templates/multiplatform-template/common/build.gradle.kts b/ci/templates/multiplatform-template/common/build.gradle.kts
index 4aa05685f65..7d059f3e1e9 100644
--- a/ci/templates/multiplatform-template/common/build.gradle.kts
+++ b/ci/templates/multiplatform-template/common/build.gradle.kts
@@ -29,6 +29,7 @@ kotlin {
 
 android {
     compileSdk = 34
+    namespace = "com.myapplication.common"
 
     defaultConfig {
         minSdk = 26
diff --git a/ci/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties b/ci/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties
index ae04661ee73..84a0b92f9af 100644
--- a/ci/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties
+++ b/ci/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists