Merge branch 'main' into kotlin-updates

bloomberg · Jul 16, 2023 · f2622dc · f2622dc
2 parents ed105a5 + 38d2ebf
commit f2622dc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -60,7 +60,7 @@ jobs:
         path: |
           **/build/reports/detekt
     - name: 'Unit tests'
-      run: ./gradlew :selekt-android:testDebugUnitTest :selekt-java:test :koverHtmlReport ${{ env.SCAN }}
+      run: ./gradlew :selekt-android:testDebugUnitTest :selekt-java:test :koverHtmlReport -x integrationTest ${{ env.SCAN }}
     - uses: actions/upload-artifact@v3
       if: always()
       with:
@@ -74,7 +74,7 @@ jobs:
         ./gradlew assembleRelease ${{ env.SCAN }}
     - name: 'Verify coverage'
       run:
-        ./gradlew :koverVerify
+        ./gradlew :koverVerify -x integrationTest
     - name: 'Build others'
       run: |
         ./gradlew assembleAndroidTest :AndroidCLI:assembleDebug :selekt-android-lint:assemble jmhClasses

diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml
@@ -48,7 +48,6 @@ jobs:
       run: |
         ./gradlew \
           -Prelease=false \
-          --no-configuration-cache \
           publishMainPublicationToSonatypeRepository \
           closeSonatypeStagingRepository
     - name: 'Publish release to OSSRH'
@@ -62,6 +61,5 @@ jobs:
       run: |
         ./gradlew \
           -Prelease=true \
-          --no-configuration-cache \
           publishMainPublicationToSonatypeRepository \
           closeAndReleaseSonatypeStagingRepository
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -231,7 +231,7 @@ koverReport {
         verify {
             rule("Minimal coverage") {
                 bound {
-                    minValue = 97
+                    minValue = 96
                     aggregation = AggregationType.COVERED_PERCENTAGE
                 }
             }

diff --git a/selekt-android/build.gradle.kts b/selekt-android/build.gradle.kts
@@ -90,8 +90,10 @@ koverReport {
 }
 
 tasks.register<Copy>("copyJniLibs") {
-    from(fileTree("${project(":selekt-sqlite3").buildDir.absolutePath}/intermediates/libs"))
-    from(fileTree("${project(":Selektric").buildDir.absolutePath}/intermediates/libs"))
+    from(
+        fileTree("${project(":selekt-sqlite3").buildDir.absolutePath}/intermediates/libs"),
+        fileTree("${project(":Selektric").buildDir.absolutePath}/intermediates/libs")
+    )
     into("${buildDir.path}/intermediates/libs/jni")
 }
 

diff --git a/selekt-java/build.gradle.kts b/selekt-java/build.gradle.kts
@@ -88,7 +88,7 @@ tasks.register<Task>("buildHostSQLite") {
 }
 
 tasks.register<Copy>("copyJniLibs") {
-    from(fileTree("${project(":selekt-sqlite3").buildDir.absolutePath}/intermediates/libs"))
+    from(fileTree("${project(":selekt-sqlite3").buildDir}/intermediates/libs"))
     into("${buildDir.path}/intermediates/libs/jni")
 }
 

diff --git a/selekt-sqlite3/build.gradle.kts b/selekt-sqlite3/build.gradle.kts
@@ -151,12 +151,9 @@ fun platformIdentifier() = "${osName()}-${System.getProperty("os.arch")}"
 
 tasks.register<Copy>("buildHost") {
     dependsOn("makeSQLite")
-    with(project.copySpec {
-        from(fileTree(".cxx-host") {
-            include("**/*.dll", "**/*.dylib", "**/*.so")
-        }.files)
-    })
-    into("${buildDir.path}/intermediates/libs/${platformIdentifier()}")
+    from(".cxx-host/sqlite3")
+    into("$buildDir/intermediates/libs/${platformIdentifier()}")
+    include("*.dll", "*.dylib", "*.so")
 }
 
 tasks.register<Exec>("cleanSqlCipher") {