diff --git a/build.gradle.kts b/build.gradle.kts index fc6c014..a9ec90c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,11 +6,11 @@ plugins { id("space.kscience.gradle.project") } -val kmathVersion: String by extra("0.3.1-dev-11") +val kmathVersion: String by extra("0.3.1-dev-RC") allprojects { group = "center.sciprog" - version = "0.2.2-dev-10" + version = "0.2.2-dev-11" repositories { mavenLocal() diff --git a/gradle.properties b/gradle.properties index c12acfb..cad90d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ kotlin.code.style=official -compose.version=1.4.0-rc01 -agp.version=7.3.1 +compose.version=1.4.0-rc03 +agp.version=7.4.2 android.useAndroidX=true org.jetbrains.compose.experimental.jscanvas.enabled=true org.gradle.jvmargs=-Xmx4096m -toolsVersion=0.14.3-kotlin-1.8.10 \ No newline at end of file +toolsVersion=0.14.6-kotlin-1.8.20 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..e1bef7e 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-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/maps-kt-features/src/jvmMain/kotlin/center/sciprog/maps/features/drawFeature.kt b/maps-kt-features/src/jvmMain/kotlin/center/sciprog/maps/features/drawFeature.kt index 1bb4648..89e69f6 100644 --- a/maps-kt-features/src/jvmMain/kotlin/center/sciprog/maps/features/drawFeature.kt +++ b/maps-kt-features/src/jvmMain/kotlin/center/sciprog/maps/features/drawFeature.kt @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.painter.Painter import center.sciprog.attributes.plus import org.jetbrains.skia.Font import org.jetbrains.skia.Paint +import space.kscience.kmath.PerformancePitfall import space.kscience.kmath.geometry.degrees -import space.kscience.kmath.misc.PerformancePitfall internal fun Color.toPaint(): Paint = Paint().apply { diff --git a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/SvgDrawScope.kt b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/SvgDrawScope.kt index 5a40130..e221fa6 100644 --- a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/SvgDrawScope.kt +++ b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/SvgDrawScope.kt @@ -210,6 +210,7 @@ public class SvgDrawScope( } + @Suppress("OVERRIDE_DEPRECATION") override fun drawImage( image: ImageBitmap, srcOffset: IntOffset, diff --git a/settings.gradle.kts b/settings.gradle.kts index 232def8..88a50fd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,6 @@ rootProject.name = "maps-kt" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") -enableFeaturePreview("VERSION_CATALOGS") pluginManagement {