chore(release): 4.2.3 [skip ci]

## [4.2.3](https://github.com/revanced/revanced-patcher/compare/v4.2.2...v4.2.3) (2022-09-08)

### Bug Fixes

* wrong value for iterator in PatchOptions ([e31ac1f](e31ac1f132))

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [4.2.3](https://github.com/revanced/revanced-patcher/compare/v4.2.2...v4.2.3) (2022-09-08)
+
+
+### Bug Fixes
+
+* wrong value for iterator in PatchOptions ([e31ac1f](https://github.com/revanced/revanced-patcher/commit/e31ac1f132df56ba7d2f8446d289ae03ef28f67d))
+
+## [4.2.2](https://github.com/revanced/revanced-patcher/compare/v4.2.1...v4.2.2) (2022-09-08)
+
+
+### Bug Fixes
+
+* invalid type propagation in options ([b873228](https://github.com/revanced/revanced-patcher/commit/b873228ef0a9e6e431a4278c979caa5fcc508e0d)), closes [#98](https://github.com/revanced/revanced-patcher/issues/98)
+
+## [4.2.1](https://github.com/revanced/revanced-patcher/compare/v4.2.0...v4.2.1) (2022-09-08)
+
+
+### Bug Fixes
+
+* make patcher version public ([76c45dd](https://github.com/revanced/revanced-patcher/commit/76c45dd7c1ffdca57e30ae7109c9fe0e5768f877))
+
 # [4.2.0](https://github.com/revanced/revanced-patcher/compare/v4.1.5...v4.2.0) (2022-09-08)
 
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 4.2.0
+version = 4.2.3

src/main/kotlin/app/revanced/patcher/Patcher.kt

@@ -39,7 +39,6 @@ import java.io.File
 import java.nio.file.Files
 
 private val NAMER = BasicDexFileNamer()
-private val VERSION = VersionReader.read()
 
 /**
  * The ReVanced Patcher.
@@ -51,6 +50,11 @@ class Patcher(private val options: PatcherOptions) {
 
     val data: PatcherData
 
+    companion object {
+        @JvmStatic
+        val version = VersionReader.read()
+    }
+
     init {
         val extInputFile = ExtFile(options.inputFile)
         try {
@@ -249,9 +253,9 @@ class Patcher(private val options: PatcherOptions) {
     fun addPatches(patches: Iterable<Class<out Patch<Data>>>) {
         for (patch in patches) {
             val needsVersion = patch.sincePatcherVersion
-            if (needsVersion != null && needsVersion > VERSION) {
+            if (needsVersion != null && needsVersion > version) {
                 logger.error("Patch '${patch.patchName}' requires Patcher version $needsVersion or higher")
-                logger.error("Current Patcher version is $VERSION")
+                logger.error("Current Patcher version is $version")
                 logger.warn("Skipping '${patch.patchName}'!")
                 continue // TODO: continue or halt/throw?
             }

src/main/kotlin/app/revanced/patcher/patch/PatchOption.kt

@@ -17,7 +17,7 @@ object RequirementNotMetException : Exception("null was passed into an option th
  * A registry for an array of [PatchOption]s.
  * @param options An array of [PatchOption]s.
  */
-class PatchOptions(vararg val options: PatchOption<*>) : Iterable<PatchOption<*>> {
+class PatchOptions(vararg options: PatchOption<*>) : Iterable<PatchOption<*>> {
     private val register = mutableMapOf<String, PatchOption<*>>()
 
     init {
@@ -60,7 +60,7 @@ class PatchOptions(vararg val options: PatchOption<*>) : Iterable<PatchOption<*>
         get(key).value = null
     }
 
-    override fun iterator() = options.iterator()
+    override fun iterator() = register.values.iterator()
 }
 
 /**
@@ -101,11 +101,13 @@ sealed class PatchOption<T>(
      * Gets the value of the option.
      * Please note that using the wrong value type results in a runtime error.
      */
-    inline operator fun <reified V> getValue(thisRef: Any?, property: KProperty<*>) =
-        value as? V ?: throw InvalidTypeException(
+    inline operator fun <reified V> getValue(thisRef: Any?, property: KProperty<*>): V? {
+        if (value !is V?) throw InvalidTypeException(
             V::class.java.canonicalName,
             value?.let { it::class.java.canonicalName } ?: "null"
         )
+        return value as? V?
+    }
 
     /**
      * Gets the value of the option.

src/test/kotlin/app/revanced/patcher/issues/Issue98.kt

@@ -0,0 +1,18 @@
+package app.revanced.patcher.issues
+
+import app.revanced.patcher.patch.PatchOption
+import org.junit.jupiter.api.Test
+import kotlin.test.assertNull
+
+internal class Issue98 {
+    companion object {
+        var key1: String? by PatchOption.StringOption(
+            "key1", null, "title", "description"
+        )
+    }
+
+    @Test
+    fun `should infer nullable type correctly`() {
+        assertNull(key1)
+    }
+}

src/test/kotlin/app/revanced/patcher/patch/PatchOptionsTest.kt

@@ -48,7 +48,7 @@ internal class PatchOptionsTest {
 
     @Test
     fun `should return a different value when changed`() {
-        var value: String by options["key1"]
+        var value: String? by options["key1"]
         val current = value + "" // force a copy
         value = "Hello, world!"
         assertNotEquals(current, value)

src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodePatch.kt

@@ -171,32 +171,32 @@ class ExampleBytecodePatch : BytecodePatch(listOf(ExampleFingerprint)) {
     }
 
     companion object : OptionsContainer() {
-        private var key1: String by option(
+        private var key1: String? by option(
             PatchOption.StringOption(
                 "key1", "default", "title", "description", true
             )
         )
-        private var key2: Boolean by option(
+        private var key2: Boolean? by option(
             PatchOption.BooleanOption(
                 "key2", true, "title", "description" // required defaults to false
             )
         )
-        private var key3: String by option(
+        private var key3: String? by option(
             PatchOption.StringListOption(
                 "key3", "TEST", listOf("TEST", "TEST1", "TEST2"), "title", "description"
             )
         )
-        private var key4: Int by option(
+        private var key4: Int? by option(
             PatchOption.IntListOption(
                 "key4", 1, listOf(1, 2, 3), "title", "description"
             )
         )
-        private var key5: Path by option(
+        private var key5: Path? by option(
             PatchOption.PathOption(
                 "key5", File("test.txt").toPath(), "title", "description"
             )
         )
-        private var key6: String by option(
+        private var key6: String? by option(
             PatchOption.StringOption(
                 "key6", null, "title", "description", true
             )