Merge branch 'dev' into feature/tensor-algebra

.github/workflows/build.yml

@@ -1,107 +1,37 @@
-name: Gradle build
+# Based on https://github.com/touchlab/Stately/blob/main/.github/workflows/build.yml
 
+name: build
 on: [ push ]
 
 jobs:
-  build-ubuntu:
-    runs-on: ubuntu-20.04
-
+  build:
+    strategy:
+      matrix:
+        os: [ macOS-latest, windows-latest ]
+    runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout the repo
+        uses: actions/checkout@v2
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Install Chrome
-        run: |
-          sudo apt install -y libappindicator1 fonts-liberation
-          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-          sudo dpkg -i google-chrome*.deb
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: gradle
-          restore-keys: gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-linux-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: ./gradlew -Dorg.gradle.daemon=false --build-cache build
-
-  build-osx:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: gradle
-          restore-keys: gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-macos-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: sudo ./gradlew -Dorg.gradle.daemon=false --build-cache build
-
-  build-windows:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
       - name: Add msys to path
+        if: matrix.os == 'windows-latest'
         run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
       - name: Cache gradle
         uses: actions/cache@v2
         with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: ${{ runner.os }}-gradle
-          restore-keys: ${{ runner.os }}-gradle
-
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Cache konan
         uses: actions/cache@v2
         with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-mingw-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: ./gradlew --build-cache build
+          path: ~/.konan
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build
+        run: ./gradlew build --no-daemon --stacktrace

.github/workflows/deploy.yml

@@ -0,0 +1,45 @@
+# Based on https://github.com/touchlab/Stately/blob/main/.github/workflows/deploy.yml
+
+name: deploy
+on: workflow_dispatch
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [macOS-latest, windows-latest]
+    runs-on: ${{matrix.os}}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Add msys to path
+        if: matrix.os == 'windows-latest'
+        run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
+      - name: Cache gradle
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Cache konan
+        uses: actions/cache@v2
+        with:
+          path: ~/.konan
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Publish Mac Artifacts
+        if: matrix.os == 'macOS-latest'
+        run: ./gradlew publishAllPublicationsToSpaceRepository publishAllPublicationsToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} -PspaceUser=${{ secrets.SPACE_USERNAME }} -PspacePassword=${{ secrets.SPACE_PASSWORD }}
+        env:
+          signingKey: ${{ secrets.SIGNING_KEY }}
+      - name: Publish Windows Artifacts
+        if: matrix.os == 'windows-latest'
+        run: ./gradlew publishAllPublicationsToSpaceRepository publishAllPublicationsToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} -PspaceUser=${{ secrets.SPACE_USERNAME }} -PspacePassword=${{ secrets.SPACE_PASSWORD }}
+        env:
+          signingKey: ${{ secrets.SIGNING_KEY }}

.github/workflows/release.yml

@@ -1,117 +0,0 @@
-name: Gradle release
-
-on:
-  release:
-    types:
-      - created
-
-jobs:
-  build-ubuntu:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Install Chrome
-        run: |
-          sudo apt install -y libappindicator1 fonts-liberation
-          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-          sudo dpkg -i google-chrome*.deb
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: gradle
-          restore-keys: gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-linux-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: ./gradlew -Dorg.gradle.daemon=false --build-cache build
-      - name: Run release task
-        run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }}
-
-  build-osx:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: gradle
-          restore-keys: gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-macos-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: sudo ./gradlew -Dorg.gradle.daemon=false --build-cache build
-      - name: Run release task
-        run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }}
-
-  build-windows:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Add msys to path
-        run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: ${{ runner.os }}-gradle
-          restore-keys: ${{ runner.os }}-gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-mingw-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: ./gradlew --build-cache build
-      - name: Run release task
-        run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }}
-

build.gradle.kts

@@ -1,3 +1,5 @@
+import ru.mipt.npm.gradle.KSciencePublishingPlugin
+
 plugins {
     id("ru.mipt.npm.gradle.project")
 }
@@ -22,7 +24,7 @@ allprojects {
 }
 
 subprojects {
-    if (name.startsWith("kmath")) apply<ru.mipt.npm.gradle.KSciencePublishingPlugin>()
+    if (name.startsWith("kmath")) apply<KSciencePublishingPlugin>()
 }
 
 readme {
@@ -35,6 +37,6 @@ ksciencePublish {
     githubProject = "kmath"
 }
 
-apiValidation{
+apiValidation {
     nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI")
 }

gradle.properties

@@ -3,6 +3,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.parallel.tasks.in.project=true
+org.gradle.configureondemand=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
 org.gradle.parallel=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true