Update android sdk to api 26

2017-08-04 05:42:43 +02:00 · 2017-08-04 05:42:43 +02:00 · acb27766a8
parent a5a307c076
commit acb27766a8
9 changed files with 93 additions and 28 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,8 @@
+### v1.0.2
+- Update to android sdk26
+- Improve build script
+- Update translation file license
+
 ### v1.0.1 (2017-07-30)
 - Update SimpleMarkdownParser
 - Move untranslatable strings
--- a/app/build.gradle
+++ b/app/build.gradle
@ -1,16 +1,30 @@
 apply plugin: 'com.android.application'
-apply plugin: 'android-apt'
+
+ext {
+    version_sdk = [
+        compileSdk : 26,
+        buildTools : "26.0.1",
+        minSdk     : 17
+        //targetSdk: compileSdk,
+    ]
+    version_sdk.targetSdk = version_sdk.compileSdk
+    version_lib = [
+        appcompat   : "26.0.0",
+        butterknife : "8.7.0",
+        netcipher   : "2.0.0-alpha1"
+    ]
+}

 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion version_sdk.compileSdk
+    buildToolsVersion version_sdk.buildTools

    defaultConfig {
-        minSdkVersion 17
-        targetSdkVersion 24
+        minSdkVersion version_sdk.minSdk
+        targetSdkVersion version_sdk.targetSdk

-        versionCode 21
-        versionName "1.0.1"
+        versionCode 22
+        versionName "1.0.2-dev"

        applicationId "com.github.dfa.diaspora_android"
        resValue 'string', 'app_name', "dandelion*"
@ -54,6 +68,7 @@ android {

 // Additional repositories
 repositories {
+    google()
    maven {
        url "https://jitpack.io"
    }
@ -68,18 +83,19 @@ dependencies {
    testCompile 'junit:junit:4.12'

    // Android standard libs
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:design:24.1.0' //Don't update. Broken up to 25.0.0
-    compile 'com.android.support:support-v4:24.2.1'
-    compile 'com.android.support:customtabs:24.2.1'
-    compile 'com.android.support:cardview-v7:24.2.1'
+    compile "com.android.support:appcompat-v7:${version_lib.appcompat}"
+    compile "com.android.support:design:${version_lib.appcompat}"
+    compile "com.android.support:support-v4:${version_lib.appcompat}"
+    compile "com.android.support:customtabs:${version_lib.appcompat}"
+    compile "com.android.support:cardview-v7:${version_lib.appcompat}"

    // More libraries
-    compile 'com.jakewharton:butterknife:8.0.1'
-    compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
-    compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1'
-    compile 'com.github.DASAR:ShiftColorPicker:v0.5'
-    apt 'com.jakewharton:butterknife-compiler:8.0.1'
+    compile "com.jakewharton:butterknife:${version_lib.butterknife}"
+    compile "info.guardianproject.netcipher:netcipher:${version_lib.netcipher}"
+    compile "info.guardianproject.netcipher:netcipher-webkit:${version_lib.netcipher}"
+    compile "com.github.DASAR:ShiftColorPicker:v0.5"
+
+    annotationProcessor "com.jakewharton:butterknife-compiler:${version_lib.butterknife}"
 }

 //  #####################
--- a/app/src/main/java/io/github/gsantner/opoc/util/AdBlock.java
+++ b/app/src/main/java/io/github/gsantner/opoc/util/AdBlock.java
@ -5,7 +5,7 @@
 * worth it, you can buy me a coke in return. Provided as is without any kind
 * of warranty. No attribution required.                  - Gregor Santner
 *
- * License: Creative Commons Zero (CC0 1.0)
+ * License of this file: Creative Commons Zero (CC0 1.0)
 *  http://creativecommons.org/publicdomain/zero/1.0/
 * ----------------------------------------------------------------------------
 */
@ -47,6 +47,7 @@ import java.util.Set;
 /**
 * Simple Host-Based AdBlocker
 */
+@SuppressWarnings({"WeakerAccess", "SpellCheckingInspection"})
 public class AdBlock {
    private static final AdBlock instance = new AdBlock();

@ -163,7 +164,7 @@ public class AdBlock {
                if (resFilename.startsWith("adblock_domains__")) {
                    adblockResIds.add(resId);
                }
-            } catch (IllegalAccessException ignored) {
+            } catch (IllegalAccessException | IllegalArgumentException ignored) {
            }
        }
        return adblockResIds;
--- a/app/src/main/res/values-ja/strings-about.xml
+++ b/app/src/main/res/values-ja/strings-about.xml
@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <string name="about_activity__title_about_app">アプリについて</string>
  <string name="about_activity__title_about_license">ライセンス</string>
  <string name="about_activity__title_debug_info">デバッグ</string>
  <string name="fragment_debug__section_app">アプリケーション</string>
  <string name="fragment_debug__section_device">デバイス</string>
+  <string name="fragment_debug__section_pod">ダイアスポラ* ポッド</string>
  <string name="fragment_debug__section_log">デバッグログ</string>
  <string name="fragment_debug__section_log_spam">デバッグ ログ (詳細)</string>
  <string name="fragment_debug__app_version">アプリバージョン: %1$s</string>
@ -27,6 +29,7 @@
  <string name="fragment_about__spread_the_word">みんなに広めよう!</string>
  <string name="fragment_about__spread_the_word_text">diaspora* と #dandelion について家族や友人に広めてください! あなたの体験についてブログしませんか? 私たちにあなたからの話を聞かせてください!</string>
  <string name="fragment_about__spread_the_word_button">アプリを共有</string>
+  <string name="fragment_about__spread_the_word_share_text">やあ! #dandelion をチェックしてください! %1$s</string>
  <!-- License & help (large amount of text) -->
  <string name="fragment_license__maintainers">メンテナンススタッフ</string>
  <string name="fragment_license__maintainers_text">現在、このアプリは以下の人によって開発およびメンテナンスされています &lt;br&gt;&lt;br&gt;%1$s</string>
--- a/app/src/main/res/values-ja/strings-preferences.xml
+++ b/app/src/main/res/values-ja/strings-preferences.xml
@ -42,8 +42,12 @@
  <string name="pref_title__load_images">画像の読み込み</string>
  <string name="pref_desc__load_images">安全なモバイルデータのため、画像の読み込みを無効にします</string>
  <!-- Screen rotation -->
+  <string name="pref_title__screen_rotation">画面の回転</string>
+  <string name="pref_desc__screen_rotation">画面の自動回転をコントロール</string>
  <string name="rotation_system">デフォルト</string>
  <string name="rotation_sensor">センサー\n(システムの設定を無視)</string>
+  <string name="rotation_portrait">ポートレート (縦向き)</string>
+  <string name="rotation_landscape">ランドスケープ (横向き)</string>
  <!-- Proxy -->
  <string name="pref_title__http_proxy_load_tor_preset">Tor プリセットを読み込む</string>
  <string name="pref_desc__http_proxy_load_tor_preset">Tor (Orbot) HTTP プロキシのプロキシ設定を読み込みます</string>
--- a/app/src/main/res/values-no-rNO/strings-preferences.xml
+++ b/app/src/main/res/values-no-rNO/strings-preferences.xml
@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Key Names (Untranslatable) -->
+  <!-- Operability -->
+  <string name="pref_title__topbar_stream_shortcut">Den øvre verktøylinjen laster inn strømmen</string>
+  <string name="pref_desc__topbar_stream_shortcut">Klikk på en tom plass i den øvre verktøylinjen for å åpne strømmen</string>
+  <!-- Category Titles -->
+  <string name="pref_cat__visuals">Utseende</string>
+  <string name="pref_cat__network">Nettverk</string>
+  <string name="pref_cat__pod_settings">Pod-innstillinger</string>
+  <string name="pref_cat__operability">Brukbarhet</string>
+  <!-- Visuals -->
+  <!-- Navigiation Slider -->
+  <string name="pref_title__sub_nav_slider">Navigasjonsbryter</string>
+  <string name="pref_desc__sub_nav_slider">Kontrollér synligheten for innlegg i navigasjonsskuffen</string>
+  <string name="pref_cat__visibility_nav_items__user">Bruker</string>
+  <string name="pref_cat__visibility_nav_items__general">Generelt</string>
+  <string name="pref_cat__visibility_nav_items__admin">Administrator</string>
+  <!-- Themes -->
+  <string name="pref_title__themes">Tema og farger</string>
+  <string name="pref_desc__themes">Kontrollér hvilke farger som brukes i appen</string>
+  <string name="pref_title__primary_color">Primærfarge</string>
+  <string name="pref_desc__primary_color">Verktøylinjefarge</string>
+  <string name="pref_title__accent_color">Aksentfarge</string>
+  <string name="pref_desc__accent_color">Fremgangslinjefarge</string>
+  <string name="pref_title__primary_color__amoled_mode">AMOLED-modus</string>
+  <!-- Notifications dropdown -->
+  <!-- Font size -->
+  <!-- Load images -->
+  <!-- Screen rotation -->
+  <!-- Proxy -->
+  <!-- Chrome custom tabs -->
+  <!-- Diaspora Settings -->
+  <!-- More -->
+</resources>
--- a/build.gradle
+++ b/build.gradle
@ -5,7 +5,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.2'
        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'

        // NOTE: Do not place your application dependencies here; they belong
--- a/circle.yml
+++ b/circle.yml
@ -19,17 +19,17 @@ machine:
 dependencies:
  pre:
    # Android SDK Platform
-    - if [ ! -d "/usr/local/android-sdk-linux/platforms/android-24" ]; then echo y | android update sdk --no-ui --all --filter "android-24"; fi
+    - if [ ! -d "/usr/local/android-sdk-linux/platforms/android-26" ]; then echo y | android update sdk --no-ui --all --filter "android-26"; fi
    # Android SDK Build-tools
-    - if [ ! -d "/usr/local/android-sdk-linux/build-tools/24.0.3" ]; then echo y | android update sdk --no-ui --all --filter "build-tools-24.0.3"; fi
-    # Android Support Repository
-    - if [ ! -d "/usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/design/24.2.0" ]; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"; fi
+    - if [ ! -d "/usr/local/android-sdk-linux/build-tools/26.0.1" ]; then echo y | android update sdk --no-ui --all --filter "build-tools-26.0.1"; fi
+    # Android Support Repository - deprecated
+    #- if [ ! -d "/usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/design/26.2.0" ]; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"; fi
    

  cache_directories:
-    - /usr/local/android-sdk-linux/platforms/android-24
-    - /usr/local/android-sdk-linux/build-tools/24.0.3
-    - /usr/local/android-sdk-linux/extras/android/m2repository
+    - /usr/local/android-sdk-linux/platforms/android-26
+    - /usr/local/android-sdk-linux/build-tools/26.0.1
+    #- /usr/local/android-sdk-linux/extras/android/m2repository

 ###################
 test:
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-all.zip