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

Commit 1e91dc9

Browse files
RedthRedth
authored
Merge pull request #678 from xamarin/dev/kotlin-1.3.50
Update to Kotlin v1.3.50
2 parents d2ff5cd + dcbab16 commit 1e91dc9

File tree

9 files changed

+121
-15
lines changed

9 files changed

+121
-15
lines changed

‎Android/Kotlin/build.cake‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
var TARGET = Argument("t", Argument("target", "Default"));
2+
var TARGET = Argument("t", Argument("target", "ci"));
33

44
Task("binderate")
55
.Does(() =>
@@ -15,7 +15,8 @@ Task("binderate")
1515
Task("native")
1616
.Does(() =>
1717
{
18-
var gradlew = MakeAbsolute((FilePath)"./native/KotlinSample/gradlew");
18+
var fn = IsRunningOnWindows() ? "gradlew.bat" : "gradlew";
19+
var gradlew = MakeAbsolute((FilePath)("./native/KotlinSample/" + fn));
1920
var exit = StartProcess(gradlew, new ProcessSettings {
2021
Arguments = "assemble",
2122
WorkingDirectory = "./native/KotlinSample/"
@@ -34,16 +35,29 @@ Task("libs")
3435
var settings = new MSBuildSettings()
3536
.SetConfiguration("Release")
3637
.SetVerbosity(Verbosity.Minimal)
38+
.EnableBinaryLogger("./output/libs.binlog")
3739
.WithRestore()
3840
.WithProperty("DesignTimeBuild", "false")
39-
.WithProperty("PackageOutputPath", MakeAbsolute((DirectoryPath)"./output/").FullPath)
40-
.WithTarget("Pack");
41+
.WithTarget("Build");
4142

4243
MSBuild("./generated/Xamarin.Kotlin.sln", settings);
4344
});
4445

4546
Task("nuget")
46-
.IsDependentOn("libs");
47+
.IsDependentOn("libs")
48+
.Does(() =>
49+
{
50+
var settings = new MSBuildSettings()
51+
.SetConfiguration("Release")
52+
.SetVerbosity(Verbosity.Minimal)
53+
.EnableBinaryLogger("./output/nuget.binlog")
54+
.WithProperty("NoBuild", "true")
55+
.WithProperty("DesignTimeBuild", "false")
56+
.WithProperty("PackageOutputPath", MakeAbsolute((DirectoryPath)"./output/").FullPath)
57+
.WithTarget("Pack");
58+
59+
MSBuild("./generated/Xamarin.Kotlin.sln", settings);
60+
});
4761

4862
Task("samples")
4963
.IsDependentOn("libs")
@@ -52,6 +66,7 @@ Task("samples")
5266
var settings = new MSBuildSettings()
5367
.SetConfiguration("Release")
5468
.SetVerbosity(Verbosity.Minimal)
69+
.EnableBinaryLogger("./output/samples.binlog")
5570
.WithRestore()
5671
.WithProperty("DesignTimeBuild", "false");
5772

@@ -70,7 +85,7 @@ Task("clean")
7085
CleanDirectories("./native/**/build");
7186
});
7287

73-
Task("Default")
88+
Task("ci")
7489
.IsDependentOn("externals")
7590
.IsDependentOn("libs")
7691
.IsDependentOn("nuget")

‎Android/Kotlin/config.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
{
2020
"groupId" : "org.jetbrains.kotlin",
2121
"artifactId" : "kotlin-stdlib",
22-
"version" : "1.3.41",
22+
"version" : "1.3.50",
2323
"nugetId" : "Xamarin.Kotlin.StdLib"
2424
},
2525
{
2626
"groupId" : "org.jetbrains.kotlin",
2727
"artifactId" : "kotlin-stdlib-common",
28-
"version" : "1.3.41",
28+
"version" : "1.3.50",
2929
"nugetId" : "Xamarin.Kotlin.StdLib.Common",
3030
"metadata" :
3131
{
@@ -35,7 +35,7 @@
3535
{
3636
"groupId" : "org.jetbrains.kotlin",
3737
"artifactId" : "kotlin-stdlib-jdk7",
38-
"version" : "1.3.41",
38+
"version" : "1.3.50",
3939
"nugetId" : "Xamarin.Kotlin.StdLib.Jdk7",
4040
"metadata" :
4141
{
@@ -45,7 +45,7 @@
4545
{
4646
"groupId" : "org.jetbrains.kotlin",
4747
"artifactId" : "kotlin-stdlib-jdk8",
48-
"version" : "1.3.41",
48+
"version" : "1.3.50",
4949
"nugetId" : "Xamarin.Kotlin.StdLib.Jdk8",
5050
"metadata" :
5151
{

‎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.3.41" />
49+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.3.50" />
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.3.41" />
45+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.3.50" />
4646
</ItemGroup>
4747
<ItemGroup>
4848
<Compile Include="Properties\AssemblyInfo.cs" />

‎Android/Kotlin/source/Project.cshtml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
7070
</PropertyGroup>
7171

72+
<PropertyGroup>
73+
<KotlinBindingSupportIgnorePath Condition="Exists('..\..\source\@(Model.NuGetPackageId)\ignore.txt')">..\..\source\@(Model.NuGetPackageId)\ignore.txt</KotlinBindingSupportIgnorePath>
74+
</PropertyGroup>
75+
7276
<ItemGroup>
7377
<None Update="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\$(TargetFramework)" />
7478
</ItemGroup>
@@ -82,6 +86,10 @@
8286
<Compile Include="..\..\source\@(Model.NuGetPackageId)\Additions\*.cs" Link="Additions\%(Filename)%(Extension)" />
8387
</ItemGroup>
8488

89+
<ItemGroup>
90+
<None Condition="Exists('..\..\source\@(Model.NuGetPackageId)\ignore.txt')" Include="..\..\source\@(Model.NuGetPackageId)\ignore.txt" />
91+
</ItemGroup>
92+
8593
<ItemGroup>
8694
@foreach (var art in @Model.MavenArtifacts) {
8795
<None Remove="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" />
@@ -98,7 +106,7 @@
98106
<PackageReference Include="@(dep.NuGetPackageId)" Version="@(dep.NuGetVersion)" />
99107
}
100108
}
101-
<PackageReference Include="Xamarin.Kotlin.BindingSupport" Version="0.1.0-preview" PrivateAssets="All" />
109+
<PackageReference Include="Xamarin.Kotlin.BindingSupport" Version="0.3.0-preview" PrivateAssets="All" />
102110
</ItemGroup>
103111

104-
</Project>
112+
</Project>

‎Android/Kotlin/source/Xamarin.Kotlin.StdLib/Additions/ClockMark.cs‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using Android.Runtime;
4+
using Java.Interop;
5+
6+
namespace Kotlin.Time
7+
{
8+
// TODO: WORKAROUND FOR https://github.com/xamarin/java.interop/issues/496
9+
partial class ClockMark
10+
{
11+
static Delegate cb_minus;
12+
#pragma warning disable 0169
13+
static Delegate GetMinus_DHandler()
14+
{
15+
if (cb_minus == null)
16+
cb_minus = JNINativeWrapper.CreateDelegate((Func<IntPtr, IntPtr, double, IntPtr>)n_Minus_D);
17+
return cb_minus;
18+
}
19+
20+
static IntPtr n_Minus_D(IntPtr jnienv, IntPtr native__this, double p0)
21+
{
22+
global::Kotlin.Time.ClockMark __this = global::Java.Lang.Object.GetObject<global::Kotlin.Time.ClockMark>(jnienv, native__this, JniHandleOwnership.DoNotTransfer);
23+
return JNIEnv.ToLocalJniHandle(__this.Minus(p0));
24+
}
25+
#pragma warning restore 0169
26+
27+
// Metadata.xml XPath method reference: path="/api/package[@name='kotlin.time']/class[@name='ClockMark']/method[@name='minus-LRDsOJo' and count(parameter)=1 and parameter[1][@type='double']]"
28+
[Register("minus-LRDsOJo", "(D)Lkotlin/time/ClockMark;", "GetMinus_DHandler")]
29+
public virtual unsafe global::Kotlin.Time.ClockMark Minus(double p0)
30+
{
31+
const string __id = "minus-LRDsOJo.(D)Lkotlin/time/ClockMark;";
32+
try
33+
{
34+
JniArgumentValue* __args = stackalloc JniArgumentValue[1];
35+
__args[0] = new JniArgumentValue(p0);
36+
var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod(__id, this, __args);
37+
return global::Java.Lang.Object.GetObject<global::Kotlin.Time.ClockMark>(__rm.Handle, JniHandleOwnership.TransferLocalRef);
38+
}
39+
finally
40+
{
41+
}
42+
}
43+
44+
static Delegate cb_plus;
45+
#pragma warning disable 0169
46+
static Delegate GetPlus_DHandler()
47+
{
48+
if (cb_plus == null)
49+
cb_plus = JNINativeWrapper.CreateDelegate((Func<IntPtr, IntPtr, double, IntPtr>)n_Plus_D);
50+
return cb_plus;
51+
}
52+
53+
static IntPtr n_Plus_D(IntPtr jnienv, IntPtr native__this, double p0)
54+
{
55+
global::Kotlin.Time.ClockMark __this = global::Java.Lang.Object.GetObject<global::Kotlin.Time.ClockMark>(jnienv, native__this, JniHandleOwnership.DoNotTransfer);
56+
return JNIEnv.ToLocalJniHandle(__this.Plus(p0));
57+
}
58+
#pragma warning restore 0169
59+
60+
// Metadata.xml XPath method reference: path="/api/package[@name='kotlin.time']/class[@name='ClockMark']/method[@name='plus-LRDsOJo' and count(parameter)=1 and parameter[1][@type='double']]"
61+
[Register("plus-LRDsOJo", "(D)Lkotlin/time/ClockMark;", "GetPlus_DHandler")]
62+
public virtual unsafe global::Kotlin.Time.ClockMark Plus(double p0)
63+
{
64+
const string __id = "plus-LRDsOJo.(D)Lkotlin/time/ClockMark;";
65+
try
66+
{
67+
JniArgumentValue* __args = stackalloc JniArgumentValue[1];
68+
__args[0] = new JniArgumentValue(p0);
69+
var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod(__id, this, __args);
70+
return global::Java.Lang.Object.GetObject<global::Kotlin.Time.ClockMark>(__rm.Handle, JniHandleOwnership.TransferLocalRef);
71+
}
72+
finally
73+
{
74+
}
75+
}
76+
}
77+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,8 @@
9797
<remove-node path="/api/package[@name='kotlin.text']/class[@name='StringsKt__StringsKt']/method[@name='trimStart' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='char...']]" />
9898
<remove-node path="/api/package[@name='kotlin.text']/class[@name='StringsKt__StringsKt']/method[@name='trimStart' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='kotlin.jvm.functions.Function1&lt;? super java.lang.Character, java.lang.Boolean&gt;']]" />
9999

100+
<!-- TODO: WORKAROUND FOR https://github.com/xamarin/java.interop/issues/496 -->
101+
<remove-node path="/api/package[@name='kotlin.time']/class[@name='ClockMark']/method[@name='minus-LRDsOJo' and count(parameter)=1 and parameter[1][@type='double']]" />
102+
<remove-node path="/api/package[@name='kotlin.time']/class[@name='ClockMark']/method[@name='plus-LRDsOJo' and count(parameter)=1 and parameter[1][@type='double']]" />
103+
100104
</metadata>

‎Android/Kotlin/source/Xamarin.Kotlin.StdLib/ignore.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
kotlin.random.RandomKt.fastLog2

‎manifest.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@
178178
- Name: Kotlin
179179
BuildScript: ./Android/Kotlin/build.cake
180180
TriggerPaths: [ Android/Kotlin ]
181-
MacBuildTargets: [ Default ]
181+
WindowsBuildTargets: [ ci ]
182+
MacBuildTargets: [ ci ]
182183
- Name: UniversalImageLoader
183184
BuildScript: ./Android/UniversalImageLoader/build.cake
184185
TriggerPaths: [ Android/UniversalImageLoader ]

0 commit comments

Comments
 (0)