Skip to content

Commit

Permalink
Update Kotlin JARs to match Proximity binding. Fixes Estimote#18.
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthewGerber committed Jan 4, 2019
1 parent 0142067 commit 55072ab
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 15 deletions.
10 changes: 5 additions & 5 deletions Estimote.Android.Indoor/Estimote.Android.Indoor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
<AndroidClassParser>class-parse</AndroidClassParser>
<PackageId>Estimote.Android.Indoor</PackageId>
<PackageVersion>2.5.4</PackageVersion>
Expand Down Expand Up @@ -115,9 +114,6 @@
<EmbeddedReferenceJar Include="Jars\internal-plugins-api-0.23.0.aar.classes.jar" />
<EmbeddedReferenceJar Include="Jars\javax.inject-1.jar" />
<EmbeddedReferenceJar Include="Jars\ketchup-0.5.0.aar.classes.jar" />
<EmbeddedReferenceJar Include="Jars\kotlin-stdlib-1.2.41.jar" />
<EmbeddedReferenceJar Include="Jars\kotlin-stdlib-jdk7-1.2.41.jar" />
<EmbeddedReferenceJar Include="Jars\kotlin-stdlib-jre7-1.2.31.jar" />
<EmbeddedReferenceJar Include="Jars\logging-interceptor-3.8.0.jar" />
<EmbeddedReferenceJar Include="Jars\okhttp-3.8.0.jar" />
<EmbeddedReferenceJar Include="Jars\okio-1.13.0.jar" />
Expand All @@ -129,12 +125,16 @@
<EmbeddedReferenceJar Include="Jars\scanning-plugin-0.23.0.aar.classes.jar" />
<EmbeddedReferenceJar Include="Jars\skald-kotlin-0.3.1.jar" />
<EmbeddedReferenceJar Include="Jars\skald-logcat-plugin-0.1.0.aar.classes.jar" />
<EmbeddedReferenceJar Include="Jars\kotlin-stdlib-1.2.51.jar" />
<EmbeddedReferenceJar Include="Jars\kotlin-stdlib-common-1.2.51.jar" />
<EmbeddedReferenceJar Include="Jars\kotlin-stdlib-jdk7-1.2.51.jar" />
<EmbeddedReferenceJar Include="Jars\kotlin-stdlib-jre7-1.2.31.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedJar Include="Jars\indoor-sdk-module-2.5.4.aar.classes.jar" />
</ItemGroup>
<ItemGroup>
<InputJar Include="Jars\kotlin-stdlib-1.2.41.jar-lite.jar" />
<InputJar Include="Jars\kotlin-stdlib-1.2.51.jar-lite.jar" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<Import Project="..\packages\NuGet.Build.Packaging.0.2.0\build\NuGet.Build.Packaging.targets" Condition="Exists('..\packages\NuGet.Build.Packaging.0.2.0\build\NuGet.Build.Packaging.targets')" />
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
<AndroidClassParser>class-parse</AndroidClassParser>
<PackageId>Estimote.Android.Proximity</PackageId>
<PackageVersion>1.0.3</PackageVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.estimote.example.Indoor">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<application android:allowBackup="true" android:label="@string/app_name">
<service android:name="com.estimote.scanning_plugin.packet_provider.service.PacketProviderWrapperService" android:enabled="true" android:exported="false" />
</application>
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<application android:allowBackup="true" android:label="@string/app_name">
<service android:name="com.estimote.scanning_plugin.packet_provider.service.PacketProviderWrapperService" android:enabled="true" android:exported="false" />
</application>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down

0 comments on commit 55072ab

Please sign in to comment.