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

[Gradle] Copy framework to BUILT_PRODUCTS_DIR in the embedAndSign task

Browse Source 
^KT-63821 Verification Pending
This commit is contained in:
Artem Daugel-Dauge
2023-12-04 11:17:21 +01:00
committed by Space Team
parent b78455093e
commit af4d5605ca
3 changed files with 115 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt
+77 -85
View File
@@ -32,34 +32,39 @@ class AppleFrameworkIT : KGPBaseTest() {
nativeProject(
"sharedAppleFramework",
gradleVersion,
buildOptions = defaultBuildOptions
) {
val environmentVariables = mapOf(
val environmentVariables = EnvironmentalVariables(
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
"BUILT_PRODUCTS_DIR" to projectPath.resolve("shared/build/builtProductsDir").toString(),
)
build(
"assembleDebugAppleFrameworkForXcodeIosArm64",
environmentVariables = EnvironmentalVariables(environmentVariables)
) {
build("assembleDebugAppleFrameworkForXcodeIosArm64", environmentVariables = environmentVariables) {
assertTasksExecuted(":shared:assembleDebugAppleFrameworkForXcodeIosArm64")
assertDirectoryInProjectExists("shared/build/xcode-frameworks/debug/iphoneos123/sdk.framework")
assertDirectoryInProjectExists("shared/build/xcode-frameworks/debug/iphoneos123/sdk.framework.dSYM")
assertDirectoryInProjectExists("shared/build/builtProductsDir/sdk.framework")
assertDirectoryInProjectExists("shared/build/builtProductsDir/sdk.framework.dSYM")
assertDirectoryInProjectDoesNotExist("shared/build/xcode-frameworks/sdk.framework")
}
build(
"assembleCustomDebugAppleFrameworkForXcodeIosArm64",
environmentVariables = EnvironmentalVariables(environmentVariables)
) {
build("clean")
build("assembleDebugAppleFrameworkForXcodeIosArm64", "-Pkotlin.apple.copyFrameworkToBuiltProductsDir=false", environmentVariables = environmentVariables) {
assertTasksExecuted(":shared:assembleDebugAppleFrameworkForXcodeIosArm64")
assertDirectoryInProjectExists("shared/build/xcode-frameworks/debug/iphoneos123/sdk.framework")
assertDirectoryInProjectExists("shared/build/xcode-frameworks/debug/iphoneos123/sdk.framework.dSYM")
assertDirectoryInProjectDoesNotExist("shared/build/builtProductsDir/sdk.framework")
}
build("assembleCustomDebugAppleFrameworkForXcodeIosArm64", environmentVariables = environmentVariables) {
assertTasksExecuted(":shared:assembleCustomDebugAppleFrameworkForXcodeIosArm64")
assertDirectoryInProjectExists("shared/build/xcode-frameworks/debug/iphoneos123/lib.framework")
assertDirectoryInProjectExists("shared/build/xcode-frameworks/debug/iphoneos123/lib.framework.dSYM")
assertDirectoryInProjectExists("shared/build/builtProductsDir/lib.framework")
assertDirectoryInProjectExists("shared/build/builtProductsDir/lib.framework.dSYM")
}
}
}
@@ -76,15 +81,15 @@ class AppleFrameworkIT : KGPBaseTest() {
gradleVersion,
buildOptions = defaultBuildOptions
) {
val environmentVariables = mapOf(
val environmentVariables = EnvironmentalVariables(
"CONFIGURATION" to "Release",
"SDK_NAME" to "iphonesimulator",
"ARCHS" to "arm64 x86_64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
"BUILT_PRODUCTS_DIR" to projectPath.resolve("shared/build/xcode-frameworks/Release/iphonesimulator").toString(),
)
build("assembleReleaseAppleFrameworkForXcode", environmentVariables = EnvironmentalVariables(environmentVariables)) {
build("assembleReleaseAppleFrameworkForXcode", environmentVariables = environmentVariables) {
assertTasksExecuted(":shared:linkReleaseFrameworkIosSimulatorArm64")
assertTasksExecuted(":shared:linkReleaseFrameworkIosX64")
assertTasksExecuted(":shared:assembleReleaseAppleFrameworkForXcode")
@@ -106,16 +111,16 @@ class AppleFrameworkIT : KGPBaseTest() {
"sharedAppleFramework",
gradleVersion,
) {
val environmentVariables = mapOf(
val environmentVariables = EnvironmentalVariables(
"CONFIGURATION" to "debug",
"SDK_NAME" to "macosx",
"ARCHS" to "x86_64",
"EXPANDED_CODE_SIGN_IDENTITY" to "-",
"TARGET_BUILD_DIR" to testBuildDir.toString(),
"FRAMEWORKS_FOLDER_PATH" to "build/xcode-derived",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
"BUILT_PRODUCTS_DIR" to projectPath.resolve("shared/build/xcode-frameworks/debug/macosx").toString(),
)
build(":shared:embedAndSignAppleFrameworkForXcode", environmentVariables = EnvironmentalVariables(environmentVariables)) {
build(":shared:embedAndSignAppleFrameworkForXcode", environmentVariables = environmentVariables) {
assertTasksExecuted(":shared:assembleDebugAppleFrameworkForXcodeMacosX64")
assertSymlinkInProjectExists("shared/build/xcode-frameworks/debug/macosx/sdk.framework/Headers")
assertSymlinkExists(testBuildDir.resolve("build/xcode-derived/sdk.framework/Headers"))
@@ -134,7 +139,7 @@ class AppleFrameworkIT : KGPBaseTest() {
"sharedAppleFramework",
gradleVersion,
) {
val environmentVariables = mapOf(
val environmentVariables = EnvironmentalVariables(
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos",
"ARCHS" to "arm64",
@@ -142,7 +147,7 @@ class AppleFrameworkIT : KGPBaseTest() {
"FRAMEWORKS_FOLDER_PATH" to "build/xcode-derived",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
build(":shared:embedAndSignAppleFrameworkForXcode", environmentVariables = EnvironmentalVariables(environmentVariables)) {
build(":shared:embedAndSignAppleFrameworkForXcode", environmentVariables = environmentVariables) {
assertDirectoryInProjectExists("build/xcode-derived/sdk.framework")
}
}
@@ -159,7 +164,7 @@ class AppleFrameworkIT : KGPBaseTest() {
"sharedAppleFramework",
gradleVersion,
) {
val environmentVariables = mapOf(
val environmentVariables = EnvironmentalVariables(
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos",
"ARCHS" to "arm64",
@@ -168,7 +173,7 @@ class AppleFrameworkIT : KGPBaseTest() {
"FRAMEWORKS_FOLDER_PATH" to "build/xcode-derived",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
build(":shared:embedAndSignAppleFrameworkForXcode", environmentVariables = EnvironmentalVariables(environmentVariables)) {
build(":shared:embedAndSignAppleFrameworkForXcode", environmentVariables = environmentVariables) {
assertDirectoryInProjectExists("build/xcode-derived/sdk.framework")
assertDirectoryInProjectDoesNotExist("build/xcode-derived/sdk.framework.DSYM")
}
@@ -198,7 +203,7 @@ class AppleFrameworkIT : KGPBaseTest() {
"sharedAppleFramework",
gradleVersion,
) {
val environmentVariables = mapOf(
val environmentVariables = EnvironmentalVariables(
"CONFIGURATION" to "Debug",
"SDK_NAME" to "iphoneos",
"ARCHS" to "arm64",
@@ -220,7 +225,7 @@ class AppleFrameworkIT : KGPBaseTest() {
"shared:assembleCustomReleaseAppleFrameworkForXcodeIosX64",
"shared:assembleCustomReleaseAppleFrameworkForXcodeIosArm64"
),
environmentVariables = EnvironmentalVariables(environmentVariables)
environmentVariables = environmentVariables
)
}
}
@@ -295,17 +300,16 @@ class AppleFrameworkIT : KGPBaseTest() {
gradleVersion,
) {
val environmentVariables = EnvironmentalVariables(
mapOf(
"CONFIGURATION" to "Debug",
"SDK_NAME" to "iphoneos",
"ARCHS" to "arm64",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
"CONFIGURATION" to "Debug",
"SDK_NAME" to "iphoneos",
"ARCHS" to "arm64",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
buildAndAssertAllTasks(
registeredTasks = listOf(
"shared:embedAndSignAppleFrameworkForXcode",
"shared:embedAndSignCustomAppleFrameworkForXcode"
"shared:embedAndSignCustomAppleFrameworkForXcode",
),
notRegisteredTasks = listOf(
"shared:assembleReleaseAppleFrameworkForXcodeIosX64",
@@ -315,9 +319,9 @@ class AppleFrameworkIT : KGPBaseTest() {
"shared:assembleCustomDebugAppleFrameworkForXcodeIosX64",
"shared:assembleCustomReleaseAppleFrameworkForXcodeIosX64",
"shared:assembleCustomDebugAppleFrameworkForXcodeIosArm64",
"shared:assembleCustomReleaseAppleFrameworkForXcodeIosArm64"
"shared:assembleCustomReleaseAppleFrameworkForXcodeIosArm64",
),
environmentVariables = environmentVariables
environmentVariables = environmentVariables,
)
buildAndFail(
":shared:embedAndSignCustomAppleFrameworkForXcode",
@@ -342,14 +346,12 @@ class AppleFrameworkIT : KGPBaseTest() {
buildOptions = defaultBuildOptions
) {
val environmentVariables = EnvironmentalVariables(
mapOf(
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to projectPath.resolve("shared/build/xcode-frameworks/debug/iphoneos123").toString(),
)
subProject("shared").buildGradleKts.modify {
@@ -379,14 +381,12 @@ class AppleFrameworkIT : KGPBaseTest() {
gradleVersion,
) {
val environmentVariables = EnvironmentalVariables(
mapOf(
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
subProject("shared").buildGradleKts.appendText(
@@ -416,14 +416,12 @@ class AppleFrameworkIT : KGPBaseTest() {
gradleVersion,
) {
val environmentVariables = EnvironmentalVariables(
mapOf(
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
projectPath.resolve("shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt")
@@ -447,14 +445,12 @@ class AppleFrameworkIT : KGPBaseTest() {
gradleVersion,
) {
val environmentVariables = EnvironmentalVariables(
mapOf(
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
projectPath.resolve("shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt")
@@ -478,14 +474,12 @@ class AppleFrameworkIT : KGPBaseTest() {
gradleVersion,
) {
val environmentVariables = EnvironmentalVariables(
mapOf(
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
projectPath.resolve("shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt")
@@ -513,14 +507,12 @@ class AppleFrameworkIT : KGPBaseTest() {
gradleVersion,
) {
val environmentVariables = EnvironmentalVariables(
mapOf(
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
"CONFIGURATION" to "debug",
"SDK_NAME" to "iphoneos123",
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use",
"BUILT_PRODUCTS_DIR" to iosBuildProductsDir().absolutePathString(),
)
projectPath.resolve("shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt")