[Gradle][Tests][MPP] Fix test-data for MPP tests

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle

@@ -5,8 +5,13 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
     compileSdkVersion 22
+    namespace 'org.jetbrains.kotlin.gradle.test.androidalfa'
 
     sourceSets {
         main.java.srcDirs += 'src/main/java2'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/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="org.jetbrains.kotlin.gradle.test.androidalfa"
     android:versionCode="1"
     android:versionName="1.0" >
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle

@@ -11,8 +11,13 @@ dependencies {
     implementation 'com.loopj.android:android-async-http:1.4.9'
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
     compileSdkVersion 22
+    namespace "org.jetbrains.kotlin.gradle.test.android.libalfa"
 
     defaultConfig {
         minSdkVersion 7

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle

@@ -9,8 +9,13 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
     compileSdkVersion 22
+    namespace 'org.jetbrains.kotlin.gradle.test.android.test'
 
     defaultConfig {
         minSdkVersion 7

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="org.jetbrains.kotlin.gradle.test.android.test"/>
+<manifest/>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/gradle.properties

@@ -1 +0,0 @@
-org.gradle.jvmargs=-XX:MaxPermSize=512m

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinToolingMetadataAndroid/build.gradle.kts

@@ -11,6 +11,7 @@ repositories {
 
 android {
     compileSdkVersion(23)
+    namespace = "kotlin.multiplatform.projects"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-49877/build.gradle.kts

@@ -9,8 +9,13 @@ repositories {
     google()
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
     compileSdk = 30
+    namespace = "foo.bar"
 }
 
 kotlin {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample6-KT-56712-umbrella-composite/producer/build.gradle.kts

@@ -13,6 +13,7 @@ repositories {
 
 android {
     compileSdk = 33
+    namespace = "com.example.producer"
 }
 
 kotlin {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidSourceSetLayout2/build.gradle.kts

@@ -7,6 +7,9 @@ plugins {
     kotlin("multiplatform")
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
 
 android {
     compileSdk = 31
@@ -14,6 +17,7 @@ android {
         minSdk = 31
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+    namespace = "org.jetbrains.kotlin.sample"
 
     android.flavorDimensions.add("market")
     android.flavorDimensions.add("price")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/multiplatformAndroidConsumer/build.gradle.kts

@@ -8,8 +8,13 @@ repositories {
     mavenCentral()
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
     compileSdkVersion(30)
+    namespace = "com.example.plainAndroidConsumer"
 }
 
 kotlin {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/plainAndroidConsumer/build.gradle.kts

@@ -3,8 +3,13 @@ plugins {
     kotlin("android")
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
     compileSdkVersion(30)
+    namespace = "com.example.plainAndroidConsumer"
 }
 
 repositories {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/producer/build.gradle.kts

@@ -17,8 +17,13 @@ publishing {
     }
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
     compileSdkVersion(30)
+    namespace = "com.example.producer"
 }
 
 kotlin {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-source-sets/lib/build.gradle.kts

@@ -3,8 +3,13 @@ plugins {
     kotlin("multiplatform")
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
     compileSdkVersion(28)
+    namespace = "io.sellmair.mpp"
     defaultConfig {
         minSdkVersion(21)
         targetSdkVersion(28)

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle

@@ -4,12 +4,17 @@ apply plugin: 'kotlin-multiplatform'
 group 'com.example'
 version '1.0'
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
-    compileSdkVersion 27
+    compileSdkVersion 31
+    namespace 'app.example.com.app_sample'
     defaultConfig {
         applicationId "app.example.com.app_sample"
-        minSdkVersion 21
+        minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="app.example.com.app_sample">
 
     <application
         android:allowBackup="true"
@@ -9,7 +8,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle

@@ -5,12 +5,17 @@ apply plugin: 'maven-publish'
 group 'com.example'
 version '1.0'
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
 android {
-    compileSdkVersion 27
+    compileSdkVersion 31
+    namespace 'app.example.com.lib'
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"