Skip to content

Commit

Permalink
3.8.2: more sensible workaround for KT-33092
Browse files Browse the repository at this point in the history
  • Loading branch information
JesusMcCloud committed Sep 23, 2024
1 parent 7f7bd78 commit 1911225
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## 3.0

### 3.8.2 (Supreme 0.3.2)
* Less destructive Hotfix for for [KT-71650](https://youtrack.jetbrains.com/issue/KT-71650/Invalid-Objective-C-Header-in-XCFramework)
* Re-enables export of `Asn1Element.Tag` class to ObjC.

### 3.8.1 (Supreme 0.3.1)
* Hotfix for [KT-71650](https://youtrack.jetbrains.com/issue/KT-71650/Invalid-Objective-C-Header-in-XCFramework)
* Disables export of `Asn1Element.Tag` class to ObjC. Signum remains usable for KMP projects,
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ kotlin.code.style=official
kotlin.js.compiler=ir
org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8

artifactVersion=3.8.1
supremeVersion=0.3.1
artifactVersion=3.8.2
supremeVersion=0.3.2

# This is not a well-defined property, the ASP convention plugin respects it, though
jdk.version=17
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import kotlinx.serialization.descriptors.PrimitiveKind
import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
import kotlin.experimental.ExperimentalObjCRefinement
import kotlin.native.HiddenFromObjC
import kotlin.experimental.ExperimentalObjCName
import kotlin.native.ObjCName

/**
* Base ASN.1 data class. Can either be a primitive (holding a value), or a structure (holding other ASN.1 elements)
Expand Down Expand Up @@ -233,10 +233,8 @@ sealed class Asn1Element(
}


@OptIn(ExperimentalObjCRefinement::class)
@Serializable
@ConsistentCopyVisibility
@HiddenFromObjC
data class Tag private constructor(
val tagValue: ULong, val encodedTagLength: Int,
@Serializable(with = ByteArrayBase64Serializer::class) val encodedTag: ByteArray
Expand Down Expand Up @@ -273,6 +271,8 @@ sealed class Asn1Element(
val SET = Tag(tagValue = BERTags.SET.toULong(), constructed = true)
val SEQUENCE = Tag(tagValue = BERTags.SEQUENCE.toULong(), constructed = true)

@OptIn(ExperimentalObjCName::class)
@ObjCName("ASN1_NULL") //workaround KT-33092
val NULL = Tag(tagValue = BERTags.ASN1_NULL.toULong(), constructed = false)
val BOOL = Tag(tagValue = BERTags.BOOLEAN.toULong(), constructed = false)
val INT = Tag(tagValue = BERTags.INTEGER.toULong(), constructed = false)
Expand Down

0 comments on commit 1911225

Please sign in to comment.