Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from using library JAR to AAR to support manifest merging #65

Closed
wants to merge 1 commit into from
Closed

Switch from using library JAR to AAR to support manifest merging #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Localytics-Android-Latest/localytics.aar
View file
Open in desktop
Binary file not shown.
Binary file removed Localytics-Android-Latest/localytics.jar
View file
Open in desktop
Binary file not shown.
17 changes: 0 additions & 17 deletions LocalyticsXamarin/Android/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,6 @@
<uses-permission android:name="com.localytics.sample.permission.C2D_MESSAGE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<application android:label="LocalyticsSample" android:icon="@drawable/icon">
<meta-data android:name="LOCALYTICS_APP_KEY" android:value="b70c948d304fc756d8b6e63-ecd3437a-a073-11e6-c6e3-008d99911bee" />
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
<activity android:name="com.localytics.androidx.PushTrackingActivity" android:enabled="true" />
<service android:name="com.localytics.androidx.InstanceIDListenerService" android:exported="false">
<intent-filter>
<action android:name="com.google.android.gms.iid.InstanceID" />
</intent-filter>
</service>
<service android:name="com.localytics.androidx.FirebaseTokenService" android:exported="true" android:enabled="true">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
</intent-filter>
</service>
<service android:name="com.localytics.androidx.FirebaseService" android:exported="true" android:enabled="true">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>
</application>
</manifest>
9 changes: 6 additions & 3 deletions LocalyticsXamarin/LocalyticsXamarin.Android/LocalyticsXamarin.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,16 +224,19 @@
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<ItemGroup>
<EmbeddedJar Include="Jars\AboutJars.txt" />
<EmbeddedJar Include="..\..\Localytics-Android-Latest\localytics.jar">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedJar>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LocalyticsXamarin.Common\LocalyticsXamarin.Common.csproj">
<Project>{BF2D2C42-B115-4B4B-A27E-B20DD0D7E207}</Project>
<Name>LocalyticsXamarin.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<LibraryProjectZip Include="..\..\Localytics-Android-Latest\localytics.aar">
<Link>localytics.aar</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</LibraryProjectZip>
</ItemGroup>
<Import Project="..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets" Condition="Exists('..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Basement.60.1142.1\build\MonoAndroid80\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.60.1142.1\build\MonoAndroid80\Xamarin.GooglePlayServices.Basement.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.60.1142.1\build\MonoAndroid80\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.60.1142.1\build\MonoAndroid80\Xamarin.GooglePlayServices.Tasks.targets')" />
Expand Down