Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ orbs:

# Define a job to be invoked later in a workflow.
# See: https://circleci.com/docs/configuration-reference/#jobs
# ref: https://circleci.com/docs/guides/execution-managed/using-macos/
jobs:
build-android:
executor: java17
Expand All @@ -29,7 +30,8 @@ jobs:

build-ios:
macos:
xcode: 15.0.0
xcode: 16.4.0
resource_class: macos.m1.medium.gen1
steps:
- checkout
- run:
Expand Down
26 changes: 2 additions & 24 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -230,30 +230,8 @@ obj/
/out/

# User-specific configurations
.idea/caches/
.idea/libraries/
.idea/shelf/
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
.idea/datasources.xml
.idea/dataSources.ids
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/assetWizardSettings.xml
.idea/gradle.xml
.idea/jarRepositories.xml
.idea/navEditor.xml
.idea
.kotlin

# Legacy Eclipse project files
.classpath
Expand Down
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

137 changes: 0 additions & 137 deletions .idea/codeStyles

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/migrations.xml

This file was deleted.

10 changes: 10 additions & 0 deletions convention-plugins/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,14 @@ plugins {

repositories {
gradlePluginPortal() // To use 'maven-publish' and 'signing' plugins in our own plugin
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}

kotlin {
jvmToolchain(17)
}
11 changes: 5 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]
agp = "8.2.0"
kotlin = "1.9.20"
compose = "1.5.4"
kotlin = "2.2.21"
compose = "1.9.5"
compose-compiler = "1.5.4"
compose-material3 = "1.1.2"
androidx-activityCompose = "1.8.0"
kotlinxSerializationJson = "1.5.1"
compose-material3 = "1.4.0"
androidx-activityCompose = "1.12.0"
kotlinxSerializationJson = "1.9.0"

[libraries]
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
Expand All @@ -22,4 +22,3 @@ androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
33 changes: 19 additions & 14 deletions kotlin-json-patch/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode

plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.androidLibrary)
id("maven-publish.conventions")
}

group = "io.github.reidsync"
version = "1.0.0"
version = "1.1.0"

kotlin {
jvm {
// …
}
js(IR) {
// …
}
ios()
androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
jvmToolchain(8)

@OptIn(ExperimentalWasmDsl::class)
wasmJs {
browser()
nodejs()
}

androidTarget {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
jvmDefault = JvmDefaultMode.DISABLE
}
publishLibraryVariants("release", "debug")
}

jvm("desktop")

listOf(
iosX64(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ internal open class Operations {
TEST to TEST_name)

fun opFromName(rfcName: String): Int {
val res=OPS.get(rfcName.toLowerCase())
val res=OPS.get(rfcName.lowercase())
if(res==null) throw InvalidJsonPatchException("unknown / unsupported operation $rfcName")
return res
}
Expand Down