Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 649c4a6

Browse files
newky2knewky2k
authored
Merge pull request #647 from xamarin/dev/kotlin-binding-1.3
Update Kotlin to v1.3.41
2 parents e7cc100 + 2b9f2f4 commit 649c4a6

File tree

5 files changed

+68
-18
lines changed

5 files changed

+68
-18
lines changed

‎Android/Kotlin/config.json‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,23 @@
99
{
1010
"templateFile": "source/Targets.cshtml",
1111
"outputFileRule" : "generated/{groupid}.{artifactid}/{nugetid}.targets"
12+
},
13+
{
14+
"templateFile": "source/Pom.cshtml",
15+
"outputFileRule" : "generated/{groupid}.{artifactid}/dependencies.pom"
1216
}
1317
],
1418
"artifacts" : [
1519
{
1620
"groupId" : "org.jetbrains.kotlin",
1721
"artifactId" : "kotlin-stdlib",
18-
"version" : "1.2.71",
22+
"version" : "1.3.41",
1923
"nugetId" : "Xamarin.Kotlin.StdLib"
2024
},
2125
{
2226
"groupId" : "org.jetbrains.kotlin",
2327
"artifactId" : "kotlin-stdlib-common",
24-
"version" : "1.2.71",
28+
"version" : "1.3.41",
2529
"nugetId" : "Xamarin.Kotlin.StdLib.Common",
2630
"metadata" :
2731
{
@@ -31,7 +35,7 @@
3135
{
3236
"groupId" : "org.jetbrains.kotlin",
3337
"artifactId" : "kotlin-stdlib-jdk7",
34-
"version" : "1.2.71",
38+
"version" : "1.3.41",
3539
"nugetId" : "Xamarin.Kotlin.StdLib.Jdk7",
3640
"metadata" :
3741
{
@@ -41,25 +45,13 @@
4145
{
4246
"groupId" : "org.jetbrains.kotlin",
4347
"artifactId" : "kotlin-stdlib-jdk8",
44-
"version" : "1.2.71",
48+
"version" : "1.3.41",
4549
"nugetId" : "Xamarin.Kotlin.StdLib.Jdk8",
4650
"metadata" :
4751
{
4852
"friendlyName" : "JDK 8 extension"
4953
}
5054
},
51-
{
52-
"groupId" : "org.jetbrains.kotlin",
53-
"artifactId" : "kotlin-stdlib-jre7",
54-
"version" : "1.2.71",
55-
"nugetId" : "Xamarin.Kotlin.StdLib.Jre7"
56-
},
57-
{
58-
"groupId" : "org.jetbrains.kotlin",
59-
"artifactId" : "kotlin-stdlib-jre8",
60-
"version" : "1.2.71",
61-
"nugetId" : "Xamarin.Kotlin.StdLib.Jre8"
62-
},
6355
{
6456
"groupId" : "org.jetbrains",
6557
"artifactId" : "annotations",

‎Android/Kotlin/samples/KotlinSample/KotlinSample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</ItemGroup>
4747
<ItemGroup>
4848
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
49-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.2.71" />
49+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.3.41" />
5050
</ItemGroup>
5151
<ItemGroup>
5252
<ProjectReference Include="..\KotlinSampleLibrary\KotlinSampleLibrary.csproj">

‎Android/Kotlin/samples/KotlinSampleLibrary/KotlinSampleLibrary.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<Reference Include="Mono.Android" />
4343
</ItemGroup>
4444
<ItemGroup>
45-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.2.71" />
45+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.3.41" />
4646
</ItemGroup>
4747
<ItemGroup>
4848
<Compile Include="Properties\AssemblyInfo.cs" />

‎Android/Kotlin/source/Pom.cshtml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
@using System.Linq
3+
@using System.IO
4+
@using System.Xml.Linq
5+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
6+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
7+
<modelVersion>4.0.0</modelVersion>
8+
<groupId>com.xamarin.kotlin.bindings</groupId>
9+
<artifactId>@(Model.Name)</artifactId>
10+
<version>1.0.0</version>
11+
<packaging>aar</packaging>
12+
<name>Xamarin Kotlin Bindings - @(Model.Name)</name>
13+
<description>Xamarin Kotlin Bindings - @(Model.Name)</description>
14+
<url>https://github.com/xamarin/XamarinComponents/tree/master/Android/Kotlin/</url>
15+
<inceptionYear>2019</inceptionYear>
16+
<licenses>
17+
<license>
18+
<name>MIT License</name>
19+
<url>https://github.com/xamarin/XamarinComponents/blob/master/Android/Kotlin/LICENSE.md</url>
20+
<distribution>repo</distribution>
21+
</license>
22+
</licenses>
23+
<developers>
24+
<developer>
25+
<name>Xamarin</name>
26+
</developer>
27+
</developers>
28+
<scm>
29+
<connection>scm:git:https://github.com/xamarin/XamarinComponents.git</connection>
30+
<url>https://github.com/xamarin/XamarinComponents/</url>
31+
</scm>
32+
@if (@Model.MavenArtifacts.Count > 0) {
33+
<dependencies>
34+
@foreach (var art in @Model.MavenArtifacts) {
35+
<dependency>
36+
<groupId>@(art.MavenGroupId)</groupId>
37+
<artifactId>@(art.MavenArtifactId)</artifactId>
38+
<version>@(art.MavenArtifactVersion)</version>
39+
<scope>compile</scope>
40+
</dependency>
41+
}
42+
</dependencies>
43+
}
44+
</project>

‎Android/Kotlin/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,26 @@
1818
<!-- fix inheritance -->
1919
<attr path="/api/package/class[implements[@name='java.lang.Comparable']]/method[@name='compareTo' and count(parameter)=1]/parameter[1]" name="managedType">Java.Lang.Object</attr>
2020
<attr path="/api/package/class[implements[@name='java.lang.Iterable']]/method[@name='iterator' and count(parameter)=0]" name="managedReturn">Java.Util.IIterator</attr>
21+
<attr path="/api/package/class[implements[@name='java.util.Collection']]/method[starts-with(@name,'add-') and count(parameter)=1]/parameter[1]" name="managedType">Java.Lang.Object</attr>
22+
<attr path="/api/package/class[implements[@name='java.util.Collection']]/method[@name='addAll' and count(parameter)=1 and parameter[1][starts-with(@type,'java.util.Collection')]]/parameter[1]" name="managedType">System.Collections.ICollection</attr>
23+
<attr path="/api/package/class[implements[@name='java.util.Collection']]/method[@name='containsAll' and count(parameter)=1 and parameter[1][starts-with(@type,'java.util.Collection')]]/parameter[1]" name="managedType">System.Collections.ICollection</attr>
24+
<attr path="/api/package/class[implements[@name='java.util.Collection']]/method[@name='removeAll' and count(parameter)=1 and parameter[1][starts-with(@type,'java.util.Collection')]]/parameter[1]" name="managedType">System.Collections.ICollection</attr>
25+
<attr path="/api/package/class[implements[@name='java.util.Collection']]/method[@name='retainAll' and count(parameter)=1 and parameter[1][starts-with(@type,'java.util.Collection')]]/parameter[1]" name="managedType">System.Collections.ICollection</attr>
26+
<remove-node path="/api/package/class[implements[@name='java.util.Collection'] and @final='true']/method[@name='getSize' and count(parameter)=0]" />
27+
<add-node path="/api/package/class[implements[@name='java.lang.Comparable'] and @final='true' and count(method[@name='compareTo'])=0]">
28+
<method abstract="false" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
29+
<parameter name="p0" type="java.lang.Object" />
30+
</method>
31+
</add-node>
32+
<attr path="/api/package/class[implements[@name='java.util.Collection']]/method[@name='iterator' and count(parameter)=0]" name="managedReturn">Java.Util.IIterator</attr>
2133
<attr path="/api/package/class[implements[@name='java.util.Iterator']]/method[@name='next' and count(parameter)=0]" name="managedReturn">Java.Lang.Object</attr>
2234
<attr path="/api/package/class[implements[@name='java.util.Map']]/method[@name='entrySet' and count(parameter)=0]" name="return">java.util.Set</attr>
2335

2436
<attr path="/api/package[@name='kotlin.ranges']/class[@name='CharRange']/method[@name='contains' and count(parameter)=1 and parameter[1][@type='char']]/parameter[1]" name="managedType">Java.Lang.Character</attr>
2537
<attr path="/api/package[@name='kotlin.ranges']/class[@name='IntRange']/method[@name='contains' and count(parameter)=1 and parameter[1][@type='int']]/parameter[1]" name="managedType">Java.Lang.Integer</attr>
2638
<attr path="/api/package[@name='kotlin.ranges']/class[@name='LongRange']/method[@name='contains' and count(parameter)=1 and parameter[1][@type='long']]/parameter[1]" name="managedType">Java.Lang.Long</attr>
39+
<attr path="/api/package[@name='kotlin.ranges']/class[@name='UIntRange']/method[starts-with(@name,'contains-') and count(parameter)=1 and parameter[1][@type='int']]/parameter[1]" name="managedType">Kotlin.UInt</attr>
40+
<attr path="/api/package[@name='kotlin.ranges']/class[@name='ULongRange']/method[starts-with(@name,'contains-') and count(parameter)=1 and parameter[1][@type='long']]/parameter[1]" name="managedType">Kotlin.ULong</attr>
2741

2842
<!-- fix up the clash with the abstract members -->
2943
<attr path="/api/package[@name='kotlin.collections']/class[@name='AbstractCollection']/method[@name='getSize' and count(parameter)=0]" name="managedName">GetSize</attr>

0 commit comments

Comments
 (0)