From a7832ad198304f8b72d82e7c6b57e5c070d44b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C4=8C=C3=A1bera?= <cabera.jakub@gmail.com>
Date: Wed, 20 Jan 2021 20:19:51 +0100
Subject: [PATCH] objconv: Update to version 2.52

![A](https://i.imgur.com/AK1P0UH.png)
---
 bucket/kotlin-native.json |  3 ++-
 bucket/kotlin.json        | 15 ++++++++-------
 bucket/objconv.json       | 19 ++++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/bucket/kotlin-native.json b/bucket/kotlin-native.json
index 7a6c2877cc..cc31f18212 100644
--- a/bucket/kotlin-native.json
+++ b/bucket/kotlin-native.json
@@ -21,7 +21,8 @@
     ],
     "env_add_path": "bin",
     "checkver": {
-        "github": "https://github.com/JetBrains/kotlin"
+        "url": "https://kotlinlang.org/releases.html",
+        "regex": ">([\\d.]+)</strong"
     },
     "autoupdate": {
         "url": "https://github.com/JetBrains/kotlin/releases/download/v$version/kotlin-native-prebuilt-windows-$version.zip",
diff --git a/bucket/kotlin.json b/bucket/kotlin.json
index 69b96b1dc4..c5106e1dda 100644
--- a/bucket/kotlin.json
+++ b/bucket/kotlin.json
@@ -3,6 +3,12 @@
     "description": "A cross-platform, statically typed, general-purpose programming language with type inference.",
     "homepage": "https://kotlinlang.org/",
     "license": "Apache-2.0",
+    "suggest": {
+        "JDK": [
+            "java/oraclejdk",
+            "java/openjdk"
+        ]
+    },
     "url": "https://github.com/JetBrains/kotlin/releases/download/v1.4.21/kotlin-compiler-1.4.21.zip",
     "hash": "46720991a716e90bfc0cf3f2c81b2bd735c14f4ea6a5064c488e04fd76e6b6c7",
     "extract_dir": "kotlinc",
@@ -15,14 +21,9 @@
     "env_set": {
         "KOTLIN_HOME": "$dir"
     },
-    "suggest": {
-        "JDK": [
-            "java/oraclejdk",
-            "java/openjdk"
-        ]
-    },
     "checkver": {
-        "github": "https://github.com/JetBrains/kotlin"
+        "url": "https://kotlinlang.org/releases.html",
+        "regex": ">([\\d.]+)</strong"
     },
     "autoupdate": {
         "url": "https://github.com/JetBrains/kotlin/releases/download/v$version/kotlin-compiler-$version.zip"
diff --git a/bucket/objconv.json b/bucket/objconv.json
index e7012cf9a0..65cb34abe5 100644
--- a/bucket/objconv.json
+++ b/bucket/objconv.json
@@ -1,16 +1,17 @@
 {
-    "version": "2020-Jun-08",
+    "version": "2.52",
     "description": "Object file converter and dissassembler",
     "homepage": "https://www.agner.org/optimize/#objconv",
     "license": "GPL-3.0-or-later",
-    "url": "https://www.agner.org/optimize/objconv.zip",
-    "checkver": "File\\s*name.{0,32}?objconv\\.zip,\\s*size:\\s*[0-9]+,\\s*last\\s*modified:\\s*(2[0-9]{3}-...-[0-9]{2})",
-    "hash": "1BFD417D73A9BEB7EBDCFC986B5607D5966BE2F7F376FEF86B7BE3ED4F3E2164",
-    "bin": "objconv.exe",
+    "architecture": {
+        "64bit": {
+            "url": "https://www.agner.org/optimize/objconv.zip#/dl.7z",
+            "hash": "1bfd417d73a9beb7ebdcfc986b5607d5966be2f7f376fef86b7be3ed4f3e2164"
+        }
+    },
     "pre_install": [
-        "Get-ChildItem $dir -Filter objconv.exe -Recurse | select -first 1 | % {  Move-Item $_.FullName -Destination $dir; Remove-Item $_.FullName.Replace($dir,'').Split('\\')[1] -Recurse }"
+        "Move-Item \"$dir\\C_\\_Public\\objconv\\x64\\Release\\objconv.exe\" \"$dir\"",
+        "Get-ChildItem \"$dir\" -Exclude 'objconv.exe' | Remove-Item -Recurse"
     ],
-    "autoupdate": {
-        "url": "https://www.agner.org/optimize/objconv.zip"
-    }
+    "bin": "objconv.exe"
 }