Preparing for Android Sensus release v1.0.0.

predictive-technology-laboratory · Jun 3, 2015 · 1c78974 · 1c78974
1 parent bdb1c66
commit 1c78974
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 112 deletions.
diff --git a/Sensus.Android/Properties/AndroidManifest.xml b/Sensus.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" package="edu.virginia.sie.ptl.sensus" android:versionName="0.10.0-prerelease" android:versionCode="11">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" package="edu.virginia.sie.ptl.sensus" android:versionName="1.0.0" android:versionCode="12">
 	<uses-sdk android:minSdkVersion="16" />
 	<application android:label="Sensus" android:icon="@drawable/ic_launcher">
 		<provider android:name="android.support.v4.content.FileProvider" android:authorities="edu.virginia.sie.ptl.sensus.fileprovider" android:grantUriPermissions="true" android:exported="false">

diff --git a/Sensus.Android/Resources/Resource.Designer.cs b/Sensus.Android/Resources/Resource.Designer.cs
diff --git a/Sensus.Android/Sensus.Android.csproj b/Sensus.Android/Sensus.Android.csproj
@@ -58,10 +58,7 @@
     <AndroidLinkMode>None</AndroidLinkMode>
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
-    <AndroidStoreUncompressedFileExtensions>
-    </AndroidStoreUncompressedFileExtensions>
-    <JavaOptions>
-    </JavaOptions>
+    <AndroidSupportedAbis>armeabi;armeabi-v7a;x86</AndroidSupportedAbis>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>

diff --git a/SensusService/SensusServiceHelper.cs b/SensusService/SensusServiceHelper.cs
@@ -755,4 +755,4 @@ public virtual void Dispose()
             SINGLETON = null;
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -755,4 +755,4 @@ public virtual void Dispose() @@
                 SINGLETON = null;
             }
         }
-    }
+    }