compile with SdkVersion 27 (Android Oreo)

abertschi · Jan 27, 2018 · 2adf1f7 · 2adf1f7
1 parent 1e2bc6a
commit 2adf1f7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,14 +4,13 @@ apply plugin: 'kotlin-android'
 
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 27
     defaultConfig {
         applicationId "ch.abertschi.adfree"
         minSdkVersion 21
-        targetSdkVersion 25
-        versionCode 17
-        versionName "0.0.4.3"
+        targetSdkVersion 27
+        versionCode 18
+        versionName "0.0.4.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

diff --git a/app/src/main/java/ch/abertschi/adfree/view/about/AboutActivity.kt b/app/src/main/java/ch/abertschi/adfree/view/about/AboutActivity.kt
@@ -15,6 +15,7 @@ import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.TextView
 import ch.abertschi.adfree.BuildConfig
 import ch.abertschi.adfree.R
@@ -58,15 +59,15 @@ class AboutActivity : Fragment(), AboutView {
         versionView?.typeface = typeFace
         versionView?.text = "v${BuildConfig.VERSION_NAME} / ${BuildConfig.VERSION_CODE}"
 
-        view?.findViewById(R.id.twitter).onClick {
+        view.findViewById<ImageView>(R.id.twitter).onClick {
             val browserIntent = Intent(Intent.ACTION_VIEW,
-                    Uri.parse("https://twitter.com/andrinbertschi"))
+                    Uri.parse("https://twitter.com/andrinbertschi?rel=adfree"))
             this.getContext().startActivity(browserIntent)
         }
 
-        view?.findViewById(R.id.website).onClick {
+        view.findViewById<ImageView>(R.id.website).onClick {
             val browserIntent = Intent(Intent.ACTION_VIEW,
-                    Uri.parse("http://abertschi.ch"))
+                    Uri.parse("http://abertschi.ch?rel=adfree"))
             this.getContext().startActivity(browserIntent)
         }
 

diff --git a/app/src/main/java/ch/abertschi/adfree/view/setting/SettingsActivity.kt b/app/src/main/java/ch/abertschi/adfree/view/setting/SettingsActivity.kt
@@ -6,6 +6,7 @@
 
 package ch.abertschi.adfree.view.setting
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.graphics.Typeface
@@ -16,6 +17,7 @@ import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.Spinner
 import android.widget.TextView
@@ -73,6 +75,7 @@ class SettingsActivity : Fragment(), SettingsView, AnkoLogger, PluginActivityAct
         pluginViewContainer?.addView(view)
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         this.rootView = view
@@ -106,10 +109,10 @@ class SettingsActivity : Fragment(), SettingsView, AnkoLogger, PluginActivityAct
                 }
             }
         }
-        view.findViewById(R.id.try_plugin_button).setOnClickListener {
+        view.findViewById<ImageView>(R.id.try_plugin_button).setOnClickListener {
             settingPresenter.tryPlugin()
         }
-        view.findViewById(R.id.setting_spinner_item_container)
+        view.findViewById<LinearLayout>(R.id.setting_spinner_item_container)
                 ?.setOnTouchListener { v, event ->
                     spinner?.performClick()
                     false

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.1'
+    ext.kotlin_version = '1.2.20'
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:1.2.0'
 
@@ -25,6 +25,7 @@ allprojects {
         }
         maven {
             url "https://maven.google.com"
+            name 'Google'
         }
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 15 14:03:49 CEST 2017
+#Fri Jan 26 20:43:37 CET 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