Merge pull request #2 from SciProgCentre/fix/kmath-0.3.1

lounres · web-flow · commit e6f5a5c2e137 · 2023-05-14T15:10:18.000+03:00
Fix annotation path and build
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,3 @@
+@altavir
+
+/kmath-trajectory @ESchouten
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,24 @@
+name: Gradle build
+
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3.5.1
+        with:
+          java-version: '11'
+          distribution: 'liberica'
+          cache: 'gradle'
+      - name: Gradle Wrapper Validation
+        uses: gradle/wrapper-validation-action@v1.0.4
+      - name: Gradle Build
+        uses: gradle/gradle-build-action@v2.4.2
+        with:
+          arguments: test jvmTest
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -0,0 +1,31 @@
+name: Dokka publication
+
+on:
+  workflow_dispatch:
+  release:
+    types: [ created ]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 40
+    steps:
+      - uses: actions/checkout@v3.0.0
+      - uses: actions/setup-java@v3.0.0
+        with:
+          java-version: 11
+          distribution: liberica
+      - name: Cache konan
+        uses: actions/cache@v3.0.1
+        with:
+          path: ~/.konan
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - uses: gradle/gradle-build-action@v2.4.2
+        with:
+          arguments: dokkaHtmlMultiModule --no-parallel
+      - uses: JamesIves/github-pages-deploy-action@v4.3.0
+        with:
+          branch: gh-pages
+          folder: build/dokka/htmlMultiModule
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,50 @@
+name: Gradle publish
+
+on:
+  workflow_dispatch:
+  release:
+    types: [ created ]
+
+jobs:
+  publish:
+    environment:
+      name: publish
+    strategy:
+      matrix:
+        os: [ macOS-latest, windows-latest ]
+    runs-on: ${{matrix.os}}
+    steps:
+      - uses: actions/checkout@v3.0.0
+      - uses: actions/setup-java@v3.10.0
+        with:
+          java-version: 11
+          distribution: liberica
+      - name: Cache konan
+        uses: actions/cache@v3.0.1
+        with:
+          path: ~/.konan
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Publish Windows Artifacts
+        if: matrix.os == 'windows-latest'
+        uses: gradle/gradle-build-action@v2.4.2
+        with:
+          arguments: |
+            publishAllPublicationsToSpaceRepository
+            -Ppublishing.targets=all
+            -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+            -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
+      - name: Publish Mac Artifacts
+        if: matrix.os == 'macOS-latest'
+        uses: gradle/gradle-build-action@v2.4.2
+        with:
+          arguments: |
+            publishMacosX64PublicationToSpaceRepository
+            publishMacosArm64PublicationToSpaceRepository
+            publishIosX64PublicationToSpaceRepository
+            publishIosArm64PublicationToSpaceRepository
+            publishIosSimulatorArm64PublicationToSpaceRepository
+            -Ppublishing.targets=all
+            -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+            -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
     id("space.kscience.gradle.mpp")
     `maven-publish`
 }
-val fxVersion by extra("11")
 
 val kmathVersion: String by project.extra
 val versionPrefix: String by project.extra("1.0.0")
@@ -17,16 +16,26 @@ allprojects {
     version = "${versionPrefix}-kmath-$kmathVersion"
 }
 
+
+dependencies {
+    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${npmlibs.versions.dokka.get()}")
+}
+
 kscience {
+    jvm()
+    js()
     native()
+    dependencies {
+        api("space.kscience:kmath-core:$kmathVersion")
+    }
 }
 
 ksciencePublish {
     pom("https://github.com/SciProgCentre/kmath-polynomial") {
         useApache2Licence()
         useSPCTeam()
     }
-    github(githubProject = "visionforge", githubOrg = "SciProgCentre")
+    github(githubProject = "kmath-polynomials", githubOrg = "SciProgCentre")
     space(
         if (isInDevelopment) {
             "https://maven.pkg.jetbrains.space/spc/p/sci/dev"
@@ -37,21 +46,8 @@ ksciencePublish {
     sonatype()
 }
 
-
-
 description = "Polynomials, rational functions, and utilities"
 
-kotlin.sourceSets {
-    commonMain {
-        dependencies {
-            api("space.kscience:kmath-core:$kmathVersion")
-        }
-    }
-}
-
-dependencies {
-    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${npmlibs.versions.dokka.get()}")
-}
 
 readme {
     maturity = space.kscience.gradle.Maturity.PROTOTYPE
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 kotlin.sourceSets.all {
     with(languageSettings) {
         optIn("kotlin.contracts.ExperimentalContracts")
-        optIn("space.kscience.kmath.misc.UnstableKMathAPI")
+        optIn("space.kscience.kmath.UnstableKMathAPI")
     }
 }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
@@ -4,12 +4,13 @@
  */
 
 @file:Suppress("LocalVariableName")
+@file:OptIn(UnstableKMathAPI::class)
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.functions.*
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.invoke
 
diff --git a/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -7,8 +7,8 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
 
diff --git a/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt b/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
@@ -5,9 +5,12 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.invoke
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.jvm.JvmName
diff --git a/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt b/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
diff --git a/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -7,7 +7,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 
 
diff --git a/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.algebra
diff --git a/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt b/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
@@ -5,12 +5,12 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.functions.testUtils.t
 import space.kscience.kmath.functions.testUtils.x
 import space.kscience.kmath.functions.testUtils.y
 import space.kscience.kmath.functions.testUtils.z
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
diff --git a/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt b/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
@@ -5,14 +5,9 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.functions.testUtils.assertEquals
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.functions.testUtils.iota
-import space.kscience.kmath.functions.testUtils.x
-import space.kscience.kmath.functions.testUtils.y
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.functions.testUtils.*
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.functions.testUtils.Rational
 import space.kscience.kmath.functions.testUtils.RationalField
 import space.kscience.kmath.functions.testUtils.assertFailsWithTypeAndMessage
diff --git a/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt b/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
diff --git a/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
@@ -5,15 +5,11 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.functions.testUtils.assertFailsWithTypeAndMessage
+import space.kscience.kmath.UnstableKMathAPI
+import space.kscience.kmath.functions.testUtils.*
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import space.kscience.kmath.functions.testUtils.bufferOf
-import space.kscience.kmath.functions.testUtils.assertEquals
 
 
 class NumberedPolynomialUtilTest {
diff --git a/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt b/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
@@ -7,7 +7,7 @@
 
 package space.kscience.kmath.functions.testUtils
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.NumbersAddOps
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+@altavir`
	`2`	`+`
	`3`	`+/kmath-trajectory @ESchouten`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ dependencies {`
`16`	`16`	`kotlin.sourceSets.all {`
`17`	`17`	`with(languageSettings) {`
`18`	`18`	`optIn("kotlin.contracts.ExperimentalContracts")`
`19`		`- optIn("space.kscience.kmath.misc.UnstableKMathAPI")`
	`19`	`+ optIn("space.kscience.kmath.UnstableKMathAPI")`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`