]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/commitdiff
projects / PrivacyBrowserAndroid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c936586)
Bump target API to 24, which includes multi-window support.
authorSoren Stoutner <soren@stoutner.com>
Tue, 20 Sep 2016 17:52:52 +0000 (10:52 -0700)
committerSoren Stoutner <soren@stoutner.com>
Tue, 20 Sep 2016 17:59:47 +0000 (10:59 -0700)
Bump target API to 24, which includes multi-window support.

.idea/gradle.xml patch | blob | history
app/build.gradle patch | blob | history
app/src/main/assets/en/about_changelog.html patch | blob | history
build.gradle patch | blob | history

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cd2ead8dfe9c7f5a66cff9583eaa6fdd61b3be12..0e23f8edad758c196e8d59c0d4b7a17807c6780f 100644 (file)
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,12 +12,7 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 1bbde24828e24fbe872133cf890c23dbb382e5f7..8920a8fa07c1258e9ad9d5268a44af7374dac958 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,22 +20,25 @@
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-    }
-
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
     defaultConfig {
         applicationId "com.stoutner.privacybrowser"
         minSdkVersion 19
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 12
         versionName "1.10"
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            shrinkResources false
+        }
+
         release {
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -49,11 +52,13 @@ android {
             applicationId "com.stoutner.privacybrowser.free"
         }
     }
+    // `return true` removes the lint error: `Not all execution paths return a value`.
+    return true
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:design:24.2.1'
     // Only compile `com.google.android.gms:play-services-ads` for the free flavor.
     freeCompile 'com.google.android.gms:play-services-ads:9.4.0'
 }
diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html
index e048f84288eac355cc332a5ee13f1e68c4c18985..7da4a7f1e5e926781a64915fe6e38b59d947c80c 100644 (file)
--- a/app/src/main/assets/en/about_changelog.html
+++ b/app/src/main/assets/en/about_changelog.html
@@ -28,7 +28,7 @@
 <body>
 
 <h3>1.10 (version code 12)</h3>
-<p>15 September 2016 - minimum API 19, target API 23</p>
+<p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=c9365866ad37cc2b0b0fa53ee04aaaa4740f70b7">15 September 2016</a> - minimum API 19, target API 23</p>
 <ul>
     <li>Add <a href="https://redmine.stoutner.com/issues/26">Tor Orbot proxy support</a>.</li>
     <li>Add <a href="https://redmine.stoutner.com/issues/30">Do Not Track</a> support.</li>
diff --git a/build.gradle b/build.gradle
index d14039de259c1ed63e55f39ab5e7f3623adf3bc0..b1932998a1c66738c780c25056bf461ebee58395 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
A web browser that respects your privacy.