misc: clean up build scripts (#119)

Author: lauzadis

.gitignore

@@ -11,4 +11,6 @@ build/
 *.iml
 .idea/
 local.properties
-*.klib
+*.klib
+.kotlin/
+dockcross-*

README.md

@@ -35,10 +35,8 @@ CRT interfaces are subject to change.
 OCI_EXE=docker python3 .github/scripts/run-container-test.py --distro al2 --arch x64 --test-bin-dir ./aws-crt-kotlin/build/bin
 ```
 
-
 See the usage/help for different distributions provided: `python3 .github/scripts/run-container.py -h`
 
-
 ### OSX
 
 #### Debugging simulator test issues
@@ -66,46 +64,9 @@ List simulator runtimes with:
 xcrun simctl list devices available
 ```
 
-
-See also: 
-
+See also:
 * https://developer.apple.com/documentation/xcode/installing-additional-simulator-runtimes
 * https://www.iosdev.recipes/simctl/
 
 ### Windows
-
-
-## Elasticurl App
-
-The `elasticurl` project contains an MPP (JVM and Native only) executable that provides a simple testing application for exercising the CRT bindings. 
-
-**Native**
-
-```
-# replace "PLATFORM" with the target platform you want to run (e.g. macosX64, linuxX64, etc)
-
-./elasticurl/bin/PLATFORM/elasticurlDebugExecutable/elasticurl.kexe [OPTIONS] URL
-```
-
-
-**JVM**
-```
-java -jar ./elasticurl/libs/elasticurl-jvm.jar [OPTIONS] URL
-```
-
-NOTE: You can also use the convenience script `./scripts/elasticurlJvm.sh [OPTIONS] URL`
-
-To enable memory tracing specify the environment variable `CRTDEBUG=trace=N` and provide the CLI option `-v trace`
-
-e.g.
-```
-CRTDEBUG=trace=2 ./elasticurl/bin/macosX64/elasticurlDebugExecutable/elasticurl.kexe -v trace https://aws.amazon.com
-```
-
-
-**Integration Test**
-
-Run the simple elasticurl integration test script
-
-`./scripts/elasticurl-test.sh`
-
+Not supported yet.

aws-crt-kotlin/api/android/aws-crt-kotlin.api

@@ -507,7 +507,6 @@ public final class aws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptionsBui
 
 public final class aws/sdk/kotlin/crt/http/HttpException : aws/sdk/kotlin/crt/CrtRuntimeException {
 	public fun <init> (I)V
-	public fun getErrorCode ()I
 }
 
 public final class aws/sdk/kotlin/crt/http/HttpHeader {

aws-crt-kotlin/api/aws-crt-kotlin.api

@@ -7,7 +7,6 @@ import aws.sdk.kotlin.gradle.crt.cmakeInstallDir
 import aws.sdk.kotlin.gradle.crt.configureCrtCMakeBuild
 import aws.sdk.kotlin.gradle.crt.disableCrossCompileTargets
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
-import aws.sdk.kotlin.gradle.kmp.IDEA_ACTIVE
 import aws.sdk.kotlin.gradle.kmp.configureKmpTargets
 import aws.sdk.kotlin.gradle.util.typedProp
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
@@ -23,7 +22,7 @@ plugins {
 val sdkVersion: String by project
 group = properties["publishGroupName"] ?: error("missing publishGroupName")
 version = sdkVersion
-description = "Kotlin Multiplatform bindings for AWS SDK Common Runtime"
+description = "Kotlin Multiplatform bindings for AWS Common Runtime"
 
 // See: https://kotlinlang.org/docs/reference/opt-in-requirements.html#opting-in-to-using-api
 val optinAnnotations = listOf("kotlin.RequiresOptIn", "kotlinx.cinterop.ExperimentalForeignApi")
@@ -45,42 +44,6 @@ kotlin {
     // FIXME - setup docker files and cmake tasks appropriately
     // mingwX64()
 
-    jvm {
-        attributes {
-            attribute<org.gradle.api.attributes.java.TargetJvmEnvironment>(
-                TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
-                objects.named(TargetJvmEnvironment.STANDARD_JVM),
-            )
-        }
-    }
-
-    // KMP doesn't support sharing source sets for multiple JVM targets OR JVM + Android targets.
-    // We can manually declare a `jvmCommon` target and wire it up. It will compile fine but Intellij does
-    // not support this and the developer experience is abysmal. Kotlin/Native suffers a similar problem and
-    // we can use the same solution. Simply, if Intellij is running (i.e. the one invoking this script) then
-    // assume we are only building for JVM. Otherwise declare the additional JVM target for Android and
-    // set the sourceSet the same for both but with different runtime dependencies.
-    // See:
-    //     * https://kotlinlang.org/docs/mpp-share-on-platforms.html#share-code-in-libraries
-    //     * https://kotlinlang.org/docs/mpp-set-up-targets.html#distinguish-several-targets-for-one-platform
-    if (!IDEA_ACTIVE) {
-
-        // NOTE: We don't actually need the Android plugin. All of the Android specifics are handled in aws-crt-java,
-        // we just need a variant with a different dependency set + some distinguishing attributes.
-        jvm("android") {
-            attributes {
-                attribute(
-                    org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.Companion.attribute,
-                    org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.androidJvm,
-                )
-                attribute(
-                    TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
-                    objects.named(TargetJvmEnvironment.ANDROID),
-                )
-            }
-        }
-    }
-
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -110,30 +73,6 @@ kotlin {
                 implementation(libs.mockserver.netty)
             }
         }
-
-        if (!IDEA_ACTIVE) {
-            val androidMain by getting {
-                // re-use the jvm (desktop) sourceSet. We only really care about declaring a variant with a different set
-                // of runtime dependencies
-                kotlin.srcDir("jvm/src")
-                dependsOn(commonMain)
-                dependencies {
-                    // we need symbols we can resolve during compilation but at runtime (i.e. on device) we depend on the Android dependency
-                    compileOnly(libs.crt.java)
-                    val crtJavaVersion = libs.versions.crt.java.version.get()
-                    implementation("software.amazon.awssdk.crt:aws-crt-android:$crtJavaVersion@aar")
-
-                    // FIXME - temporary integration with CompletableFuture while we work out a POC on the jvm target
-                    implementation(libs.kotlinx.coroutines.jdk8)
-                }
-            }
-
-            // disable compilation of android test source set. It is the same as the jvmTest sourceSet/tests. This
-            // sourceSet only exists to create a new variant that is the same in every way except the runtime
-            // dependency on aws-crt-android. To test this we would need to run it on device/emulator.
-            tasks.getByName("androidTest").enabled = false
-            tasks.getByName("compileTestKotlinAndroid").enabled = false
-        }
     }
 
     sourceSets.all {

aws-crt-kotlin/api/jvm/aws-crt-kotlin.api

@@ -21,7 +21,7 @@ buildscript {
 }
 
 plugins {
-    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
+    alias(libs.plugins.kotlinx.binary.compatibility.validator)
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.aws.kotlin.repo.tools.kmp)
     alias(libs.plugins.aws.kotlin.repo.tools.artifactsizemetrics)
@@ -60,7 +60,7 @@ subprojects {
 if (project.typedProp<Boolean>("kotlinWarningsAsErrors") == true) {
     allprojects {
         tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-            kotlinOptions.allWarningsAsErrors = true
+            compilerOptions.allWarningsAsErrors = true
         }
     }
 }
@@ -75,7 +75,3 @@ val lintPaths = listOf(
 )
 
 configureLinting(lintPaths)
-
-apiValidation {
-    ignoredProjects += setOf("elasticurl")
-}