azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use proper distributionSha256Sum for android tests

Browse Source
This commit is contained in:
Mikhail Bogdanov
2020-05-24 15:37:45 +02:00
parent bfad00e8c9
commit b61b4e4a97
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt
+7 -4
View File
@@ -100,9 +100,11 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
File("./gradlew.bat").copyTo(File(projectRoot, "gradlew.bat")); File("./gradlew.bat").copyTo(File(projectRoot, "gradlew.bat"));
val file = File(target, "gradle-wrapper.properties") val file = File(target, "gradle-wrapper.properties")
file.readLines().map { file.readLines().map {
if (it.startsWith("distributionUrl")) when {
"distributionUrl=https\\://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip" it.startsWith("distributionUrl") -> "distributionUrl=https\\://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip"
else it it.startsWith("distributionSha256Sum") -> "distributionSha256Sum=$GRADLE_SHA_256"
else -> it
}
}.let { lines -> }.let { lines ->
FileWriter(file).use { fw -> FileWriter(file).use { fw ->
lines.forEach { line -> lines.forEach { line ->
@@ -315,7 +317,8 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
CodegenTestCase.createTestFilesFromFile(file, expectedText, "kotlin.coroutines", false, TargetBackend.JVM) CodegenTestCase.createTestFilesFromFile(file, expectedText, "kotlin.coroutines", false, TargetBackend.JVM)
companion object { companion object {
const val GRADLE_VERSION = "5.6.4" const val GRADLE_VERSION = "5.6.4" // update GRADLE_SHA_256 on change
const val GRADLE_SHA_256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d"
const val testClassPackage = "org.jetbrains.kotlin.android.tests" const val testClassPackage = "org.jetbrains.kotlin.android.tests"
const val testClassName = "CodegenTestCaseOnAndroid" const val testClassName = "CodegenTestCaseOnAndroid"
const val baseTestClassPackage = "org.jetbrains.kotlin.android.tests" const val baseTestClassPackage = "org.jetbrains.kotlin.android.tests"