Merge pull request #61 from estivensh4/release/0.7.0

Release/0.7.1
estivensh · Mar 15, 2024 · 72f9a9c · 72f9a9c
2 parents 2d3c1f8 + b8f4981
commit 72f9a9c
Show file tree

Hide file tree

Showing 349 changed files with 3,249 additions and 586 deletions.
diff --git a/.github/template/deploy/action.yml b/.github/template/deploy/action.yml
@@ -37,7 +37,7 @@ runs:
         path: ~/.m2/repository/io/github/estivensh4
     - name: Sample - ${{ inputs.target }}
       shell: bash
-      run: cd samples/${{ inputs.target }} && ./local-check.sh
+      run: cd sample/${{ inputs.target }} && ./local-check.sh
     - name: Publish Test Report
       uses: mikepenz/action-junit-report@v2
       if: ${{ always() }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   build-library:
-    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
           name: code-coverage-report-${{ github.job }}
           path: "**/build/reports/**/*"
   check-sample-android-app:
-    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     needs: build-library
     runs-on: ubuntu-latest
     steps:
@@ -81,7 +81,7 @@ jobs:
           target: androidapp
           githubToken: ${{ secrets.GITHUB_TOKEN }}
   check-sample-desktop-app:
-    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     needs: build-library
     runs-on: ubuntu-latest
     steps:
@@ -93,7 +93,7 @@ jobs:
           target: desktopApp
           githubToken: ${{ secrets.GITHUB_TOKEN }}
   check-sample-wear-app:
-    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     needs: build-library
     runs-on: ubuntu-latest
     steps:
@@ -105,7 +105,7 @@ jobs:
           target: wearapp
           githubToken: ${{ secrets.GITHUB_TOKEN }}
   check-sample-web-app:
-   # if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+   # if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     needs: build-library
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -16,18 +16,17 @@ permissions:
 
 jobs:
   build:
-    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     name: Build and analyze
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up JDK 17
+      - name: set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: '17'
           distribution: 'zulu'
+          cache: gradle
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   build-documentation:
-    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -45,7 +45,7 @@ jobs:
           retention-days: 7
 
   test-documentation:
-    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     needs: build-documentation
     runs-on: ubuntu-latest
 
@@ -62,7 +62,7 @@ jobs:
           instance: ${{ env.INSTANCE }}
 
   deploy-documentation:
-    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -27,7 +27,7 @@ env:
 
 jobs:
   pre-build:
-    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     name: Publish library at mavenCentral
     runs-on: self-hosted
     steps:
@@ -57,7 +57,7 @@ jobs:
       - name: Publish library
         run: ./gradlew publish --no-parallel
   release:
-   # if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+   # if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'sample/')
     name: Create release v${{ github.event.inputs.version }}
     needs: pre-build
     runs-on: self-hosted

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@
 Thank you all for your work! ❤️
 
 <a href="https://github.com/estivensh4/aws-kmp/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=estivensh4/aws-kmp" />
+  <img src="https://contrib.rocks/image?repo=estivensh4/aws-kmp"  alt=""/>
 </a>
 
 [badge-android]: http://img.shields.io/badge/-android-6EDB8D.svg?style=flat

diff --git a/aws-common/build.gradle.kts b/aws-common/build.gradle.kts
@@ -19,6 +19,10 @@ kotlin {
 
     jvmToolchain(11)
 
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+
     androidTarget {
         publishAllLibraryVariants()
         compilations.all {

diff --git a/aws-dynamo/build.gradle.kts b/aws-dynamo/build.gradle.kts
@@ -14,13 +14,19 @@ plugins {
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
 kotlin {
-    targetHierarchy.default()
+    applyDefaultHierarchyTemplate()
+
+    jvmToolchain(11)
+
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
 
     androidTarget {
         publishAllLibraryVariants()
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/aws-dynamo/src/iosMain/kotlin/com/estivensh4/dynamo/AWSDynamo.kt b/aws-dynamo/src/iosMain/kotlin/com/estivensh4/dynamo/AWSDynamo.kt
@@ -204,6 +204,7 @@ fun AWSDynamoDBUpdateItemOutput?.toResult(): UpdateItemResult {
     )
 }
 
+@Suppress("UNCHECKED_CAST")
 @OptIn(ExperimentalForeignApi::class)
 fun AWSDynamoDBScanOutput?.toResult(): ScanResult {
     val item = this?.items as List<Map<String, AttributeValue>>
@@ -212,6 +213,7 @@ fun AWSDynamoDBScanOutput?.toResult(): ScanResult {
     )
 }
 
+@Suppress("UNCHECKED_CAST")
 @OptIn(ExperimentalForeignApi::class)
 fun AWSDynamoDBQueryOutput?.toResult(): QueryResult {
     val item = this?.items as List<Map<String, AttributeValue>>

diff --git a/aws-s3/build.gradle.kts b/aws-s3/build.gradle.kts
@@ -20,6 +20,10 @@ kotlin {
 
     jvmToolchain(11)
 
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+
     androidTarget {
         publishAllLibraryVariants()
         compilations.all {

diff --git a/aws-s3/src/androidUnitTest/kotlin/com/estivensh4/s3/UploadFile.kt b/aws-s3/src/androidUnitTest/kotlin/com/estivensh4/s3/UploadFile.kt
@@ -6,6 +6,6 @@ package com.estivensh4.s3
 
 import io.mockk.mockk
 
-actual fun createUploadFileForTest(): UploadFile {
+actual fun createUploadFileForTest(): UploadFile? {
     return mockk(relaxed = true)
 }
diff --git a/aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt b/aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt
@@ -229,12 +229,15 @@ class AWSS3CommonTest {
 
     @Test
     fun `put object success`() = runTest {
-        val result = client.putObject(
-            bucketName = bucketName,
-            key = key,
-            uploadFile = createUploadFileForTest()
-        )
+        createUploadFileForTest()?.let {
+            val result = client.putObject(
+                bucketName = bucketName,
+                key = key,
+                uploadFile = it
+            )
+
+            assertNotNull(result.eTag)
+        }
 
-        assertNotNull(result.eTag)
     }
 }
diff --git a/aws-s3/src/commonTest/kotlin/com/estivensh4/s3/UploadFile.kt b/aws-s3/src/commonTest/kotlin/com/estivensh4/s3/UploadFile.kt
@@ -4,4 +4,4 @@
 
 package com.estivensh4.s3
 
-expect fun createUploadFileForTest(): UploadFile
+expect fun createUploadFileForTest(): UploadFile?
diff --git a/aws-s3/src/iosMain/kotlin/com/estivensh4/s3/UploadFile.kt b/aws-s3/src/iosMain/kotlin/com/estivensh4/s3/UploadFile.kt
@@ -9,11 +9,10 @@ import kotlinx.cinterop.addressOf
 import kotlinx.cinterop.usePinned
 import platform.Foundation.NSData
 import platform.UIKit.UIImage
-import platform.UIKit.UIImageJPEGRepresentation
 import platform.UIKit.UIImagePNGRepresentation
 import platform.posix.memcpy
 
-actual class UploadFile constructor(
+actual class UploadFile(
     private val data: NSData
 ) {
     actual fun toByteArray(): ByteArray {
@@ -28,7 +27,7 @@ actual class UploadFile constructor(
     }
 }
 
-fun UIImage.toPNGUploadFile() : UploadFile {
-    val data = UIImagePNGRepresentation(this) ?: throw Exception("Could not convert uiImage")
-    return UploadFile(data)
+fun UIImage.toPNGUploadFile(): UploadFile? {
+    val data = UIImagePNGRepresentation(this)
+    return data?.let { UploadFile(it) }
 }
diff --git a/aws-s3/src/iosTest/kotlin/com/estivensh4/s3/UploadFile.kt b/aws-s3/src/iosTest/kotlin/com/estivensh4/s3/UploadFile.kt
@@ -6,6 +6,6 @@ package com.estivensh4.s3
 
 import platform.UIKit.UIImage
 
-actual fun createUploadFileForTest(): UploadFile {
+actual fun createUploadFileForTest(): UploadFile? {
     return UIImage().toPNGUploadFile()
 }
diff --git a/aws-s3/src/jvmTest/kotlin/com/estivensh4/s3/UploadFile.kt b/aws-s3/src/jvmTest/kotlin/com/estivensh4/s3/UploadFile.kt
@@ -6,6 +6,6 @@ package com.estivensh4.s3
 
 import io.mockk.mockk
 
-actual fun createUploadFileForTest(): UploadFile {
+actual fun createUploadFileForTest(): UploadFile? {
     return mockk(relaxed = true)
 }
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -6,6 +6,10 @@ plugins {
     `kotlin-dsl`
 }
 
+kotlin {
+    jvmToolchain(11)
+}
+
 repositories {
     mavenCentral()
     google()

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,8 +14,8 @@ plugins {
     alias(libs.plugins.kotlinAndroid) apply false
     alias(libs.plugins.dokka)
     id("io.kotest.multiplatform") version "5.8.0" apply false
-    id("org.jetbrains.kotlinx.kover") version "0.7.4"
-    id("org.sonarqube") version "3.5.0.2730"
+    id("org.jetbrains.kotlinx.kover") version "0.7.6"
+    id("org.sonarqube") version "4.4.1.3373"
 }
 
 val ktlintVersion = libs.versions.ktlint.version.get()
@@ -107,7 +107,7 @@ sonar {
         property("sonar.organization", "estivensh4-1")
         property("sonar.host.url", "https://sonarcloud.io")
         property("sonar.sourceEncoding", "UTF-8")
-        property("sonar.sources", "aws-s3, aws-common, aws-dynamo")
+        //property("sonar.sources", "aws-s3, aws-common, aws-dynamo")
         property("sonar.test", ".")
         property("sonar.exclusions", "")
         property("sonar.test.exclusions", "")

diff --git a/detekt.yml b/detekt.yml
@@ -127,7 +127,7 @@ complexity:
     threshold: 600
   LongMethod:
     active: true
-    threshold: 60
+    threshold: 100
   LongParameterList:
     active: true
     functionThreshold: 6
@@ -293,7 +293,7 @@ exceptions:
       - 'Throwable'
     allowedExceptionNameRegex: '_|(ignore|expected).*'
   TooGenericExceptionThrown:
-    active: true
+    active: false
     exceptionNames:
       - 'Error'
       - 'Exception'
@@ -556,7 +556,7 @@ style:
     active: true
     maxJumpCount: 1
   MagicNumber:
-    active: true
+    active: false
     excludes: ['**/test/**', '**/*Test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**', '**/*.kts']
     ignoreNumbers:
       - '-1'
@@ -597,7 +597,7 @@ style:
   NestedClassesVisibility:
     active: true
   NewLineAtEndOfFile:
-    active: true
+    active: false
   NoTabs:
     active: false
   NullableBooleanCheck:

diff --git a/doc/Writerside/writerside.cfg b/doc/Writerside/writerside.cfg
@@ -6,5 +6,5 @@
     <images dir="images" web-path="aws-kmp"/>
     <categories src="c.list"/>
     <vars src="v.list"/>
-    <instance src="akm.tree" keymaps-mode="provided" version="v0.6.0"/>
+    <instance src="akm.tree" keymaps-mode="provided" version="v0.7.1"/>
 </ihp>
diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,5 @@ android.nonTransitiveRClass=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.cacheKind.iosArm64=none
 
-mobile.multiplatform.iosTargetWarning=false
+mobile.multiplatform.iosTargetWarning=false
+org.jetbrains.compose.experimental.jscanvas.enabled=true
diff --git a/gradle/aws.versions.toml b/gradle/aws.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-aws = "0.6.0"
+aws = "0.7.1"
 
 [libraries]
 aws-common = { module = "io.github.estivensh4:aws-common", version.ref = "aws" }