From 2fdae48186fb9f7e82ee4b4b20c04934f12f6fd2 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Sat, 12 Dec 2020 22:42:02 +0100
Subject: [PATCH 1/3] KotlinX coroutines

---
 Android/Kotlin/config.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Android/Kotlin/config.json b/Android/Kotlin/config.json
index a874af7157..c817e6098c 100644
--- a/Android/Kotlin/config.json
+++ b/Android/Kotlin/config.json
@@ -73,6 +73,20 @@
 			"version" : "13.0",
 			"nugetId" : "Xamarin.Jetbrains.Annotations",
 			"nugetVersion" : "13.0.0.3"
+		},
+		{
+			"groupId" : "org.jetbrains.kotlinx",
+			"artifactId" : "kotlinx-coroutines-android",
+			"version" : "1.3.4",
+			"nugetId" : "Xamarin.KotlinX.CoroutinesAndroid",
+			"nugetVersion" : "1.3.4"
+		},
+		{
+			"groupId" : "org.jetbrains.kotlinx",
+			"artifactId" : "kotlinx-coroutines-core",
+			"version" : "1.3.4",
+			"nugetId" : "Xamarin.KotlinX.CoroutinesCore",
+			"nugetVersion" : "1.3.4"
 		}
 	]
 }]

From 9bddfa8cc864d3e342a7d176370caceb1de7f817 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Sun, 20 Dec 2020 19:11:21 +0100
Subject: [PATCH 2/3] KotlinX finished

---
 Android/Kotlin/config.json                    |  4 +-
 .../Transforms/EnumFields.xml                 | 19 ++++++
 .../Transforms/EnumMethods.xml                | 19 ++++++
 .../Transforms/Metadata.Namespace.xml         | 64 +++++++++++++++++++
 .../Transforms/Metadata.xml                   | 32 ++++++++++
 .../Transforms/EnumFields.xml                 | 19 ++++++
 .../Transforms/EnumMethods.xml                | 19 ++++++
 .../Transforms/Metadata.Namespaces.xml        | 11 ++++
 .../Transforms/Metadata.xml                   | 10 +++
 9 files changed, 195 insertions(+), 2 deletions(-)
 create mode 100644 Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/EnumFields.xml
 create mode 100644 Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/EnumMethods.xml
 create mode 100644 Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/Metadata.Namespace.xml
 create mode 100644 Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/Metadata.xml
 create mode 100644 Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/EnumFields.xml
 create mode 100644 Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/EnumMethods.xml
 create mode 100644 Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/Metadata.Namespaces.xml
 create mode 100644 Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/Metadata.xml

diff --git a/Android/Kotlin/config.json b/Android/Kotlin/config.json
index c817e6098c..1d021641d1 100644
--- a/Android/Kotlin/config.json
+++ b/Android/Kotlin/config.json
@@ -78,14 +78,14 @@
 			"groupId" : "org.jetbrains.kotlinx",
 			"artifactId" : "kotlinx-coroutines-android",
 			"version" : "1.3.4",
-			"nugetId" : "Xamarin.KotlinX.CoroutinesAndroid",
+			"nugetId" : "Xamarin.KotlinX.Coroutines.CoroutinesAndroid",
 			"nugetVersion" : "1.3.4"
 		},
 		{
 			"groupId" : "org.jetbrains.kotlinx",
 			"artifactId" : "kotlinx-coroutines-core",
 			"version" : "1.3.4",
-			"nugetId" : "Xamarin.KotlinX.CoroutinesCore",
+			"nugetId" : "Xamarin.KotlinX.Coroutines.Core",
 			"nugetVersion" : "1.3.4"
 		}
 	]
diff --git a/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/EnumFields.xml b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/EnumFields.xml
new file mode 100644
index 0000000000..8e966170ba
--- /dev/null
+++ b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/EnumFields.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<enum-field-mappings>
+  <!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
+    <field clr-name="Id" jni-name="Fragment_id" value="1" />
+    <field clr-name="Name" jni-name="Fragment_name" value="0" />
+    <field clr-name="Tag" jni-name="Fragment_tag" value="2" />
+  </type>
+
+  Notes:
+  - An optional "bitfield" attribute marks the enum type with [Flags].
+  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
+  -->
+</enum-field-mappings>
diff --git a/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/EnumMethods.xml b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/EnumMethods.xml
new file mode 100644
index 0000000000..8d059c2dcd
--- /dev/null
+++ b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/EnumMethods.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<enum-method-mappings>
+  <!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+
+  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
+    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
+  </mapping>
+
+  Notes:
+  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
+  - To change the type of the return value, use "return" as the parameter name.
+  - The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
+  -->
+</enum-method-mappings>
diff --git a/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/Metadata.Namespace.xml b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/Metadata.Namespace.xml
new file mode 100644
index 0000000000..9dc8851b80
--- /dev/null
+++ b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/Metadata.Namespace.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines
+  </attr>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.channels']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.Channels
+  </attr>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.flow']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.Flow
+  </attr>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.flow.internal']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.Flow.Internal
+  </attr>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.internal']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.Internal
+  </attr>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.intrinsics']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.Intrinsics
+  </attr>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.scheduling']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.Scheduling
+  </attr>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.selects']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.Selects
+  </attr>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.sync']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.Sync
+  </attr>
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.test']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.Test
+  </attr>
+
+</metadata>
diff --git a/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/Metadata.xml b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/Metadata.xml
new file mode 100644
index 0000000000..ffb675aa70
--- /dev/null
+++ b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.Core/Transforms/Metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+    <!--
+    duplicate
+    
+    removed:
+    obsolete
+    -->
+    <remove-node
+        path="/api/package[@name='kotlinx.coroutines.channels']/class[@name='ChannelsKt']/method[@name='filterIndexedTo' and count(parameter)=4 and parameter[1][@type='kotlinx.coroutines.channels.ReceiveChannel&lt;? extends E&gt;'] and parameter[2][@type='C'] and parameter[3][@type='kotlin.jvm.functions.Function2&lt;? super java.lang.Integer, ? super E, java.lang.Boolean&gt;'] and parameter[4][@type='kotlin.coroutines.Continuation&lt;? super C&gt;']]"
+        />
+    <remove-node
+        path="/api/package[@name='kotlinx.coroutines.channels']/class[@name='ChannelsKt']/method[@name='filterIndexedTo' and count(parameter)=4 and parameter[1][@type='kotlinx.coroutines.channels.ReceiveChannel&lt;? extends E&gt;'] and parameter[2][@type='C'] and parameter[3][@type='kotlin.jvm.functions.Function2&lt;? super java.lang.Integer, ? super E, java.lang.Boolean&gt;'] and parameter[4][@type='kotlin.coroutines.Continuation&lt;? super C&gt;']]"
+        />
+    <remove-node
+        path="/api/package[@name='kotlinx.coroutines.channels']/class[@name='ChannelsKt']/method[@name='filterNotTo' and count(parameter)=4 and parameter[1][@type='kotlinx.coroutines.channels.ReceiveChannel&lt;? extends E&gt;'] and parameter[2][@type='C'] and parameter[3][@type='kotlin.jvm.functions.Function1&lt;? super E, java.lang.Boolean&gt;'] and parameter[4][@type='kotlin.coroutines.Continuation&lt;? super C&gt;']]"
+        />
+    <remove-node
+        path="/api/package[@name='kotlinx.coroutines.channels']/class[@name='ChannelsKt']/method[@name='filterNotTo' and count(parameter)=4 and parameter[1][@type='kotlinx.coroutines.channels.ReceiveChannel&lt;? extends E&gt;'] and parameter[2][@type='C'] and parameter[3][@type='kotlin.jvm.functions.Function1&lt;? super E, java.lang.Boolean&gt;'] and parameter[4][@type='kotlin.coroutines.Continuation&lt;? super C&gt;']]"
+        />
+    <remove-node
+        path="/api/package[@name='kotlinx.coroutines.channels']/class[@name='ChannelsKt']/method[@name='filterNotNullTo' and count(parameter)=3 and parameter[1][@type='kotlinx.coroutines.channels.ReceiveChannel&lt;? extends E&gt;'] and parameter[2][@type='C'] and parameter[3][@type='kotlin.coroutines.Continuation&lt;? super C&gt;']]"
+        />
+    <remove-node
+        path="/api/package[@name='kotlinx.coroutines.channels']/class[@name='ChannelsKt']/method[@name='filterNotNullTo' and count(parameter)=3 and parameter[1][@type='kotlinx.coroutines.channels.ReceiveChannel&lt;? extends E&gt;'] and parameter[2][@type='C'] and parameter[3][@type='kotlin.coroutines.Continuation&lt;? super C&gt;']]"
+        />
+
+    <remove-node
+        path="/api/package[@name='kotlinx.coroutines.internal']"
+        />
+
+</metadata>
diff --git a/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/EnumFields.xml b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/EnumFields.xml
new file mode 100644
index 0000000000..8e966170ba
--- /dev/null
+++ b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/EnumFields.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<enum-field-mappings>
+  <!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
+    <field clr-name="Id" jni-name="Fragment_id" value="1" />
+    <field clr-name="Name" jni-name="Fragment_name" value="0" />
+    <field clr-name="Tag" jni-name="Fragment_tag" value="2" />
+  </type>
+
+  Notes:
+  - An optional "bitfield" attribute marks the enum type with [Flags].
+  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
+  -->
+</enum-field-mappings>
diff --git a/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/EnumMethods.xml b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/EnumMethods.xml
new file mode 100644
index 0000000000..8d059c2dcd
--- /dev/null
+++ b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/EnumMethods.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<enum-method-mappings>
+  <!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+
+  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
+    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
+  </mapping>
+
+  Notes:
+  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
+  - To change the type of the return value, use "return" as the parameter name.
+  - The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
+  -->
+</enum-method-mappings>
diff --git a/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/Metadata.Namespaces.xml b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/Metadata.Namespaces.xml
new file mode 100644
index 0000000000..ce6142cf66
--- /dev/null
+++ b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/Metadata.Namespaces.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.android']" 
+      name="managedName"
+      >
+      Xamarin.KotlinX.Coroutines.CoroutinesAndroid
+  </attr>
+
+</metadata>
diff --git a/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/Metadata.xml b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/Metadata.xml
new file mode 100644
index 0000000000..3639fb0a86
--- /dev/null
+++ b/Android/Kotlin/source/Xamarin.KotlinX.Coroutines.CoroutinesAndroid/Transforms/Metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+
+  <attr 
+      path="/api/package[@name='kotlinx.coroutines.android']/class[@name='HandlerDispatcher']/method[@name='getImmediate' and count(parameter)=0]" name="managedReturn"
+      >
+      Xamarin.KotlinX.Coroutines.MainCoroutineDispatcher
+  </attr>
+
+</metadata>

From 60434b273a2cbb61bc94f1344554ac98b9fd5bae Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Sun, 20 Dec 2020 19:11:25 +0100
Subject: [PATCH 3/3] Create cgmanifest.json

---
 Android/Kotlin/cgmanifest.json | 85 ++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 Android/Kotlin/cgmanifest.json

diff --git a/Android/Kotlin/cgmanifest.json b/Android/Kotlin/cgmanifest.json
new file mode 100644
index 0000000000..3a82561960
--- /dev/null
+++ b/Android/Kotlin/cgmanifest.json
@@ -0,0 +1,85 @@
+{
+  "Registrations": [
+    {
+      "Component": {
+        "Type": "Maven",
+        "Maven": {
+          "ArtifactId": "kotlin-stdlib",
+          "GroupId": "org.jetbrains.kotlin",
+          "Version": "1.4.20"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "Maven",
+        "Maven": {
+          "ArtifactId": "kotlin-stdlib-common",
+          "GroupId": "org.jetbrains.kotlin",
+          "Version": "1.4.20"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "Maven",
+        "Maven": {
+          "ArtifactId": "kotlin-reflect",
+          "GroupId": "org.jetbrains.kotlin",
+          "Version": "1.4.20"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "Maven",
+        "Maven": {
+          "ArtifactId": "kotlin-stdlib-jdk7",
+          "GroupId": "org.jetbrains.kotlin",
+          "Version": "1.4.20"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "Maven",
+        "Maven": {
+          "ArtifactId": "kotlin-stdlib-jdk8",
+          "GroupId": "org.jetbrains.kotlin",
+          "Version": "1.4.20"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "Maven",
+        "Maven": {
+          "ArtifactId": "annotations",
+          "GroupId": "org.jetbrains.kotlin",
+          "Version": "13.0.0.3"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "Maven",
+        "Maven": {
+          "ArtifactId": "kotlinx-coroutines-android",
+          "GroupId": "org.jetbrains.kotlinx",
+          "Version": "1.3.4"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "Maven",
+        "Maven": {
+          "ArtifactId": "kotlinx-coroutines-core",
+          "GroupId": "org.jetbrains.kotlinx",
+          "Version": "1.3.4"
+        }
+      }
+    }
+  ],
+  "Version": 1
+}
\ No newline at end of file