From 5d00fcf9076c2adce2a7ef6b2cef291bf36c8820 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 8 Mar 2018 13:15:54 +0300 Subject: initial set of changes to target SDK 27 --- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- org.fox.ttrss/build.gradle | 20 ++++++++++---------- .../src/main/java/org/fox/ttrss/CommonActivity.java | 11 ++++------- org.fox.ttrss/src/main/res/layout/headlines_row.xml | 4 ++-- .../src/main/res/layout/headlines_row_unread.xml | 4 ++-- tt-rss-android.iml | 2 +- 7 files changed, 24 insertions(+), 25 deletions(-) mode change 100644 => 100755 tt-rss-android.iml diff --git a/build.gradle b/build.gradle index ae5a0eb1..441d42e0 100755 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } @@ -13,5 +14,6 @@ allprojects { maven { url "http://dl.bintray.com/populov/maven" } maven { url "http://jzaccone.github.io/SlidingMenu-aar" } jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 909ab337..f102298b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon May 29 14:03:50 MSK 2017 +#Thu Mar 08 12:50:31 MSK 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index cabd2045..e65aa406 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { applicationId "org.fox.ttrss" buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" minSdkVersion 16 - targetSdkVersion 23 // we're not targeting SDK 25 because of this: https://issuetracker.google.com/issues/37103380#makechanges + targetSdkVersion 27 // we're not targeting SDK 25 because of this: https://issuetracker.google.com/issues/37103380#makechanges } lintOptions { @@ -36,13 +36,13 @@ dependencies { compile 'com.bogdwellers:pinchtozoom:0.1' compile 'com.github.bumptech.glide:glide:3.8.0' compile 'jp.wasabeef:glide-transformations:2.0.2' - compile 'com.android.support:recyclerview-v7:25.3.1' - compile 'com.android.support:cardview-v7:25.3.1' - compile 'com.android.support:support-v4:25.3.1' - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:customtabs:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.google.code.gson:gson:2.7' + compile 'com.android.support:recyclerview-v7:27.1.0' + compile 'com.android.support:cardview-v7:27.1.0' + compile 'com.android.support:support-v4:27.1.0' + compile 'com.android.support:appcompat-v7:27.1.0' + compile 'com.android.support:customtabs:27.1.0' + compile 'com.android.support:design:27.1.0' + compile 'com.google.code.gson:gson:2.8.0' compile 'com.shamanland:fab:0.0.8' compile 'ch.acra:acra:4.9.1' compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar' diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 6aef10ea..41a2cc19 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -27,14 +27,13 @@ import android.support.customtabs.CustomTabsIntent; import android.support.customtabs.CustomTabsServiceConnection; import android.support.customtabs.CustomTabsSession; import android.support.design.widget.Snackbar; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.util.Log; import android.util.TypedValue; import android.view.Display; import android.view.View; import android.widget.CheckBox; -import android.widget.Toast; import com.bumptech.glide.Glide; @@ -44,13 +43,11 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -public class CommonActivity extends ActionBarActivity implements SharedPreferences.OnSharedPreferenceChangeListener { +public class CommonActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener { private final String TAG = this.getClass().getSimpleName(); public final static String FRAG_HEADLINES = "headlines"; @@ -416,7 +413,7 @@ public class CommonActivity extends ActionBarActivity implements SharedPreferenc if (askEveryTime) { View dialogView = View.inflate(this, R.layout.dialog_open_link_askcb, null); - final CheckBox askEveryTimeCB = (CheckBox) dialogView.findViewById(R.id.open_link_ask_checkbox); + final CheckBox askEveryTimeCB = dialogView.findViewById(R.id.open_link_ask_checkbox); AlertDialog.Builder builder = new AlertDialog.Builder( CommonActivity.this) diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index c4540cb0..a57b6953 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -59,13 +59,13 @@ - + -- cgit v1.2.3-54-g00ecf