Merge branch 'release/3.1.0'

duckduckgo · May 8, 2017 · c9f5da3 · c9f5da3
2 parents 6e5b252 + e122321
commit c9f5da3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 36 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.duckduckgo.mobile.android"
-    android:installLocation="auto"
-    android:versionCode="79"
-    android:versionName="3.0.17">
+    android:installLocation="auto">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="23" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -42,30 +39,6 @@
             <meta-data
                 android:name="com.android.systemui.action_assist_icon"
                 android:resource="@drawable/icon"/>
-            <!--
-            <intent-filter>
-                <action android:name="android.intent.action.ASSIST"/>
-                <action android:name="android.intent.action.SEARCH" />
-                <action android:name="android.intent.action.SEARCH_LONG_PRESS" />
-                <category android:name="android.intent.category.DEFAULT" />\
-            </intent-filter>-->
-<!--
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.WEB_SEARCH" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
--->
             <meta-data android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity>
@@ -98,14 +71,7 @@
 		        <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
 		    </intent-filter>
 		</receiver>
-
-		<activity android:name="info.guardianproject.onionkit.ui.CertDisplayActivity"
-            android:configChanges="locale|orientation"
-            android:theme="@android:style/Theme.Dialog"
-            android:taskAffinity="" />
-<!--
-        <service android:name="com.duckduckgo.mobile.android.subscribers.MainSubscriber" />
-	-->
+
     </application>
 
 </manifest>
diff --git a/build.gradle b/build.gradle
@@ -15,6 +15,14 @@ android {
   compileSdkVersion 23
   buildToolsVersion "23.0.3"
 
+  defaultConfig {
+    applicationId "com.duckduckgo.mobile.android"
+    minSdkVersion 16
+    targetSdkVersion 23
+    versionCode 100
+    versionName "3.1.0"
+  }
+
   repositories {
     mavenCentral()
   }