From a12c6454161212b4529a4363d6f846e4308933d7 Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Sat, 3 Oct 2020 23:13:08 +0700 Subject: [PATCH 1/4] Move to kscience --- .../kotlin/{scietifik => kscience}/kmath/asm/TestAsmAlgebras.kt | 2 +- .../{scietifik => kscience}/kmath/asm/TestAsmExpressions.kt | 2 +- .../{scietifik => kscience}/kmath/asm/TestAsmSpecialization.kt | 2 +- .../{scietifik => kscience}/kmath/asm/TestAsmVariables.kt | 2 +- .../jvmTest/kotlin/{scietifik => kscience}/kmath/ast/AsmTest.kt | 2 +- .../{scietifik => kscience}/kmath/ast/ParserPrecedenceTest.kt | 2 +- .../kotlin/{scietifik => kscience}/kmath/ast/ParserTest.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename kmath-ast/src/jvmTest/kotlin/{scietifik => kscience}/kmath/asm/TestAsmAlgebras.kt (99%) rename kmath-ast/src/jvmTest/kotlin/{scietifik => kscience}/kmath/asm/TestAsmExpressions.kt (96%) rename kmath-ast/src/jvmTest/kotlin/{scietifik => kscience}/kmath/asm/TestAsmSpecialization.kt (98%) rename kmath-ast/src/jvmTest/kotlin/{scietifik => kscience}/kmath/asm/TestAsmVariables.kt (95%) rename kmath-ast/src/jvmTest/kotlin/{scietifik => kscience}/kmath/ast/AsmTest.kt (96%) rename kmath-ast/src/jvmTest/kotlin/{scietifik => kscience}/kmath/ast/ParserPrecedenceTest.kt (97%) rename kmath-ast/src/jvmTest/kotlin/{scietifik => kscience}/kmath/ast/ParserTest.kt (98%) diff --git a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmAlgebras.kt b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmAlgebras.kt similarity index 99% rename from kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmAlgebras.kt rename to kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmAlgebras.kt index 5d8f90c9b..0cf1307d1 100644 --- a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmAlgebras.kt +++ b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmAlgebras.kt @@ -1,4 +1,4 @@ -package scietifik.kmath.asm +package kscience.kmath.asm import kscience.kmath.asm.compile import kscience.kmath.ast.mstInField diff --git a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmExpressions.kt b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmExpressions.kt similarity index 96% rename from kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmExpressions.kt rename to kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmExpressions.kt index c2e45b8ff..7f4d453f7 100644 --- a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmExpressions.kt +++ b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmExpressions.kt @@ -1,4 +1,4 @@ -package scietifik.kmath.asm +package kscience.kmath.asm import kscience.kmath.asm.compile import kscience.kmath.ast.mstInField diff --git a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmSpecialization.kt b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmSpecialization.kt similarity index 98% rename from kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmSpecialization.kt rename to kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmSpecialization.kt index 2b27fdc0f..8f8175acd 100644 --- a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmSpecialization.kt +++ b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmSpecialization.kt @@ -1,4 +1,4 @@ -package scietifik.kmath.asm +package kscience.kmath.asm import kscience.kmath.asm.compile import kscience.kmath.ast.mstInField diff --git a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmVariables.kt b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmVariables.kt similarity index 95% rename from kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmVariables.kt rename to kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmVariables.kt index 3511be97c..7b89c74fa 100644 --- a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/asm/TestAsmVariables.kt +++ b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/asm/TestAsmVariables.kt @@ -1,4 +1,4 @@ -package scietifik.kmath.asm +package kscience.kmath.asm import kscience.kmath.ast.mstInRing import kscience.kmath.expressions.invoke diff --git a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/ast/AsmTest.kt b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/ast/AsmTest.kt similarity index 96% rename from kmath-ast/src/jvmTest/kotlin/scietifik/kmath/ast/AsmTest.kt rename to kmath-ast/src/jvmTest/kotlin/kscience/kmath/ast/AsmTest.kt index bb371bed0..1ca8aa5dd 100644 --- a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/ast/AsmTest.kt +++ b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/ast/AsmTest.kt @@ -1,4 +1,4 @@ -package scietifik.kmath.ast +package kscience.kmath.ast import kscience.kmath.asm.compile import kscience.kmath.asm.expression diff --git a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/ast/ParserPrecedenceTest.kt b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/ast/ParserPrecedenceTest.kt similarity index 97% rename from kmath-ast/src/jvmTest/kotlin/scietifik/kmath/ast/ParserPrecedenceTest.kt rename to kmath-ast/src/jvmTest/kotlin/kscience/kmath/ast/ParserPrecedenceTest.kt index 21ee47d13..1844a0991 100644 --- a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/ast/ParserPrecedenceTest.kt +++ b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/ast/ParserPrecedenceTest.kt @@ -1,4 +1,4 @@ -package scietifik.kmath.ast +package kscience.kmath.ast import kscience.kmath.ast.evaluate import kscience.kmath.ast.parseMath diff --git a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/ast/ParserTest.kt b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/ast/ParserTest.kt similarity index 98% rename from kmath-ast/src/jvmTest/kotlin/scietifik/kmath/ast/ParserTest.kt rename to kmath-ast/src/jvmTest/kotlin/kscience/kmath/ast/ParserTest.kt index 8a5d6ba48..2dc24597e 100644 --- a/kmath-ast/src/jvmTest/kotlin/scietifik/kmath/ast/ParserTest.kt +++ b/kmath-ast/src/jvmTest/kotlin/kscience/kmath/ast/ParserTest.kt @@ -1,4 +1,4 @@ -package scietifik.kmath.ast +package kscience.kmath.ast import kscience.kmath.ast.evaluate import kscience.kmath.ast.mstInField From 627e18f6ec6f502ff4604b7f096fb16feb7091ca Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Tue, 13 Oct 2020 16:59:21 +0700 Subject: [PATCH 2/4] Hotfix of better-parse configuration (its classes are exposed as API but are not available to user) --- kmath-ast/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts index 86b10bdc7..687e9f3b0 100644 --- a/kmath-ast/build.gradle.kts +++ b/kmath-ast/build.gradle.kts @@ -6,7 +6,7 @@ kotlin.sourceSets { commonMain { dependencies { api(project(":kmath-core")) - implementation("com.github.h0tk3y.betterParse:better-parse:0.4.0") + api("com.github.h0tk3y.betterParse:better-parse:0.4.0") } } From 78fa87711680e96ebf97dc0146e1de6cc55d4618 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 14 Oct 2020 11:25:03 +0300 Subject: [PATCH 3/4] Update README.md Fix #152 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24a7d7a4a..53de9f037 100644 --- a/README.md +++ b/README.md @@ -87,8 +87,8 @@ repositories{ } dependencies{ - api("scientifik:kmath-core:${kmathVersion}") - //api("scientifik:kmath-core-jvm:${kmathVersion}") for jvm-specific version + api("kscience.kmath:kmath-core:${kmathVersion}") + //api("scientifik:kmath-core:${kmathVersion}") for 0.1.3 and earlier } ``` From 457931dd86c89a61130a881fa8629c1467b47eef Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Wed, 21 Oct 2020 02:26:54 +0700 Subject: [PATCH 4/4] Update Gradle --- CHANGELOG.md | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89e02d3b1..214730ecc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ ### Changed - Package changed from `scientifik` to `kscience.kmath`. -- Gradle version: 6.6 -> 6.6.1 +- Gradle version: 6.6 -> 6.7 - Minor exceptions refactor (throwing `IllegalArgumentException` by argument checks instead of `IllegalStateException`) - `Polynomial` secondary constructor made function. - Kotlin version: 1.3.72 -> 1.4.20-M1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 12d38de6a..be52383ef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists