Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit 87e963a

Browse files
committed
tests(tooling/plugin): use download version for logsender artifacts in tests
1 parent 1165f12 commit 87e963a

File tree

2 files changed

+5
-3
lines changed
  • tooling/plugin/src
    • main/java/com/itsaky/androidide/gradle
    • test/java/com/itsaky/androidide/gradle

2 files changed

+5
-3
lines changed

tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ internal val Project.isTestEnv: Boolean
3838
_PROPERTY_IS_TEST_ENV).toString().toBoolean()
3939

4040
internal fun depVersion(testEnv: Boolean): String {
41-
return if (testEnv ) {
41+
return if (testEnv && !System.getenv("CI").toBoolean()) {
4242
BuildInfo.VERSION_NAME_SIMPLE
4343
} else {
4444
BuildInfo.VERSION_NAME_DOWNLOAD

tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package com.itsaky.androidide.gradle
1919

2020
import com.itsaky.androidide.buildinfo.BuildInfo
21+
import com.itsaky.androidide.tooling.api.LogSenderConfig._PROPERTY_IS_TEST_ENV
22+
import com.itsaky.androidide.tooling.api.LogSenderConfig._PROPERTY_MAVEN_LOCAL_REPOSITORY
2123
import com.itsaky.androidide.utils.FileProvider
2224
import org.gradle.testkit.runner.BuildResult
2325
import org.gradle.testkit.runner.GradleRunner
@@ -55,8 +57,8 @@ internal fun buildProject(
5557
val args = mutableListOf(
5658
":app:tasks", // run any task, as long as it applies the plugins
5759
"--init-script", initScript.pathString,
58-
"-Pandroidide.plugins.internal.isTestEnv=true", // plugins should be published to maven local first
59-
"-Pandroidide.plugins.internal.mavenLocalRepositories=$repositories",
60+
"-P$_PROPERTY_IS_TEST_ENV=true", // plugins should be published to maven local first
61+
"-P$_PROPERTY_MAVEN_LOCAL_REPOSITORY=$repositories",
6062
"--stacktrace"
6163
)
6264

0 commit comments

Comments
 (0)