MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

KTIJ-29196 Gradle scripts highlighting tests: remove AGP ones

Browse Source 
AGP depends on a Java version which is out the test control.
For tests running on TC it's not acceptable.

^KTIJ-29196 fixed

GitOrigin-RevId: 5b22e8b76b47d515b6f085e470c0182c3c90e71b
This commit is contained in:
Andrei Klunnyi
2024-04-09 17:07:10 +02:00
committed by intellij-monorepo-bot
parent 8bec63b32d
commit cd431a177e
16 changed files with 0 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTestGenerated.java
View File

@@ -31,11 +31,6 @@ public abstract class GradleBuildFileHighlightingTestGenerated extends AbstractG
super.setUp();
}
@TestMetadata("gradleSampleAndroidApps")
public void testGradleSampleAndroidApps() throws Exception {
runTest("../../../idea/tests/testData/gradle/highlighting/gradle8/gradleSampleAndroidApps/");
}
@TestMetadata("gradleSampleMultiProject")
public void testGradleSampleMultiProject() throws Exception {
runTest("../../../idea/tests/testData/gradle/highlighting/gradle8/gradleSampleMultiProject/");
@@ -80,11 +75,6 @@ public abstract class GradleBuildFileHighlightingTestGenerated extends AbstractG
super.setUp();
}
@TestMetadata("gradleSampleAndroidApps")
public void testGradleSampleAndroidApps() throws Exception {
runTest("../../../idea/tests/testData/gradle/highlighting/gradle7/gradleSampleAndroidApps/");
}
@TestMetadata("gradleSampleMultiProject")
public void testGradleSampleMultiProject() throws Exception {
runTest("../../../idea/tests/testData/gradle/highlighting/gradle7/gradleSampleMultiProject/");

10
plugins/kotlin/gradle/gradle-java/tests.k2/test/org/jetbrains/kotlin/idea/k2/highlighting/K2GradleBuildFileHighlightingTestGenerated.java
View File

@@ -31,11 +31,6 @@ public abstract class K2GradleBuildFileHighlightingTestGenerated extends Abstrac
super.setUp();
}
@TestMetadata("gradleSampleAndroidApps")
public void testGradleSampleAndroidApps() throws Exception {
runTest("../../../idea/tests/testData/gradle/highlighting/gradle8/gradleSampleAndroidApps/");
}
@TestMetadata("gradleSampleMultiProject")
public void testGradleSampleMultiProject() throws Exception {
runTest("../../../idea/tests/testData/gradle/highlighting/gradle8/gradleSampleMultiProject/");
@@ -80,11 +75,6 @@ public abstract class K2GradleBuildFileHighlightingTestGenerated extends Abstrac
super.setUp();
}
@TestMetadata("gradleSampleAndroidApps")
public void testGradleSampleAndroidApps() throws Exception {
runTest("../../../idea/tests/testData/gradle/highlighting/gradle7/gradleSampleAndroidApps/");
}
@TestMetadata("gradleSampleMultiProject")
public void testGradleSampleMultiProject() throws Exception {
runTest("../../../idea/tests/testData/gradle/highlighting/gradle7/gradleSampleMultiProject/");

35
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle7/gradleSampleAndroidApps/app/build.gradle.kts
View File

@@ -1,35 +0,0 @@
plugins {
id("com.android.application") version "7.3.0"
}
repositories {
google()
mavenCentral()
}
android {
compileSdkVersion(30)
defaultConfig {
applicationId = "org.gradle.samples"
minSdkVersion(16)
targetSdkVersion(30)
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
}
dependencies {
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("com.google.android.material:material:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
testImplementation("junit:junit:4.13.1")
androidTestImplementation("androidx.test.ext:junit:1.1.2")
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
}

35
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle7/gradleSampleAndroidApps/app/build.gradle.kts.highlighting
View File

@@ -1,35 +0,0 @@
plugins {
id("com.android.application") version "7.3.0"
}
repositories {
google()
mavenCentral()
}
android {
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] 'compileSdkVersion(Int): Unit' is deprecated. Replaced by compileSdk'; textAttributesKey='DEPRECATED_ATTRIBUTES'")!>compileSdkVersion<!>(30)
defaultConfig {
applicationId = "org.gradle.samples"
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] 'minSdkVersion(Int): Unit' is deprecated. Replaced by minSdk property'; textAttributesKey='DEPRECATED_ATTRIBUTES'")!>minSdkVersion<!>(16)
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] 'targetSdkVersion(Int): Unit' is deprecated. Replaced by targetSdk property'; textAttributesKey='DEPRECATED_ATTRIBUTES'")!>targetSdkVersion<!>(30)
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
}
dependencies {
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("com.google.android.material:material:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
testImplementation("junit:junit:4.13.1")
androidTestImplementation("androidx.test.ext:junit:1.1.2")
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
}

35
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle7/gradleSampleAndroidApps/app/build.gradle.kts.highlighting.k2
View File

@@ -1,35 +0,0 @@
plugins {
id("com.android.application") version "7.3.0"
}
repositories {
google()
mavenCentral()
}
android {
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] '@Incubating() @Deprecated(...) fun compileSdkVersion(apiLevel: Int): Unit' is deprecated. Replaced by compileSdk.'")!>compileSdkVersion<!>(30)
defaultConfig {
applicationId = "org.gradle.samples"
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] '@Deprecated(...) @Incubating() fun minSdkVersion(minSdkVersion: Int): Unit' is deprecated. Replaced by minSdk property.'")!>minSdkVersion<!>(16)
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] '@Deprecated(...) @Incubating() fun targetSdkVersion(targetSdkVersion: Int): Unit' is deprecated. Replaced by targetSdk property.'")!>targetSdkVersion<!>(30)
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
}
dependencies {
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("com.google.android.material:material:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
testImplementation("junit:junit:4.13.1")
androidTestImplementation("androidx.test.ext:junit:1.1.2")
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
}

20
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle7/gradleSampleAndroidApps/gradle.properties
View File

@@ -1,20 +0,0 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

10
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle7/gradleSampleAndroidApps/settings.gradle.kts
View File

@@ -1,10 +0,0 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
}
}
rootProject.name = "my-app"
include(":app")

10
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle7/gradleSampleAndroidApps/settings.gradle.kts.highlighting
View File

@@ -1,10 +0,0 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
}
}
rootProject.name = "my-app"
include(":app")

10
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle7/gradleSampleAndroidApps/settings.gradle.kts.highlighting.k2
View File

@@ -1,10 +0,0 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
}
}
rootProject.name = "my-app"
include(":app")

35
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle8/gradleSampleAndroidApps/app/build.gradle.kts
View File

@@ -1,35 +0,0 @@
plugins {
id("com.android.application") version "7.3.0"
}
repositories {
google()
mavenCentral()
}
android {
compileSdkVersion(30)
defaultConfig {
applicationId = "org.gradle.samples"
minSdkVersion(16)
targetSdkVersion(30)
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
}
dependencies {
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("com.google.android.material:material:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
testImplementation("junit:junit:4.13.1")
androidTestImplementation("androidx.test.ext:junit:1.1.2")
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
}

35
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle8/gradleSampleAndroidApps/app/build.gradle.kts.highlighting
View File

@@ -1,35 +0,0 @@
plugins {
id("com.android.application") version "7.3.0"
}
repositories {
google()
mavenCentral()
}
android {
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] 'compileSdkVersion(Int): Unit' is deprecated. Replaced by compileSdk'; textAttributesKey='DEPRECATED_ATTRIBUTES'")!>compileSdkVersion<!>(30)
defaultConfig {
applicationId = "org.gradle.samples"
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] 'minSdkVersion(Int): Unit' is deprecated. Replaced by minSdk property'; textAttributesKey='DEPRECATED_ATTRIBUTES'")!>minSdkVersion<!>(16)
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] 'targetSdkVersion(Int): Unit' is deprecated. Replaced by targetSdk property'; textAttributesKey='DEPRECATED_ATTRIBUTES'")!>targetSdkVersion<!>(30)
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
}
dependencies {
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("com.google.android.material:material:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
testImplementation("junit:junit:4.13.1")
androidTestImplementation("androidx.test.ext:junit:1.1.2")
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
}

35
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle8/gradleSampleAndroidApps/app/build.gradle.kts.highlighting.k2
View File

@@ -1,35 +0,0 @@
plugins {
id("com.android.application") version "7.3.0"
}
repositories {
google()
mavenCentral()
}
android {
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] '@Incubating() @Deprecated(...) fun compileSdkVersion(apiLevel: Int): Unit' is deprecated. Replaced by compileSdk.'")!>compileSdkVersion<!>(30)
defaultConfig {
applicationId = "org.gradle.samples"
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] '@Deprecated(...) @Incubating() fun minSdkVersion(minSdkVersion: Int): Unit' is deprecated. Replaced by minSdk property.'")!>minSdkVersion<!>(16)
<!HIGHLIGHTING("severity='WARNING'; descr='[DEPRECATION] '@Deprecated(...) @Incubating() fun targetSdkVersion(targetSdkVersion: Int): Unit' is deprecated. Replaced by targetSdk property.'")!>targetSdkVersion<!>(30)
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
}
dependencies {
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("com.google.android.material:material:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
testImplementation("junit:junit:4.13.1")
androidTestImplementation("androidx.test.ext:junit:1.1.2")
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
}

20
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle8/gradleSampleAndroidApps/gradle.properties
View File

@@ -1,20 +0,0 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

10
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle8/gradleSampleAndroidApps/settings.gradle.kts
View File

@@ -1,10 +0,0 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
}
}
rootProject.name = "my-app"
include(":app")

10
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle8/gradleSampleAndroidApps/settings.gradle.kts.highlighting
View File

@@ -1,10 +0,0 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
}
}
rootProject.name = "my-app"
include(":app")

10
plugins/kotlin/idea/tests/testData/gradle/highlighting/gradle8/gradleSampleAndroidApps/settings.gradle.kts.highlighting.k2
View File

@@ -1,10 +0,0 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
}
}
rootProject.name = "my-app"
include(":app")