Updated Target Android SDK Level to 30.

This commit is contained in:
Neil Marietta 2020-11-11 16:59:10 +01:00
parent 06e1ed44ac
commit ec97d4dfbc
10 changed files with 26 additions and 2 deletions

View File

@ -25,7 +25,7 @@ import org.gradle.api.JavaVersion
object ProtonCore {
/** The Android API level as target of the App */
const val targetSdk = 28
const val targetSdk = 30
/** The Android API level required for run the App */
const val minSdk = 23
/** The version of the JDK */

View File

@ -17,6 +17,7 @@
*/
package me.proton.core.network.data
import android.os.Build
import io.mockk.MockKAnnotations
import io.mockk.every
import io.mockk.impl.annotations.MockK
@ -34,6 +35,7 @@ import org.minidns.dnsmessage.DnsMessage
import org.minidns.record.Record
import org.minidns.record.TXT
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import kotlin.test.AfterTest
import kotlin.test.BeforeTest
import kotlin.test.Test
@ -42,6 +44,7 @@ import kotlin.test.assertEquals
// Can't use runBlockingTest with MockWebServer. See:
// https://github.com/square/retrofit/issues/3330
// https://github.com/Kotlin/kotlinx.coroutines/issues/1204
@Config(sdk = [Build.VERSION_CODES.M])
@RunWith(RobolectricTestRunner::class)
internal class DohProviderTests {

View File

@ -18,6 +18,7 @@
package me.proton.core.network.data
import android.os.Build
import io.mockk.MockKAnnotations
import io.mockk.coEvery
import io.mockk.every
@ -52,6 +53,7 @@ import org.junit.After
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import retrofit2.converter.scalars.ScalarsConverterFactory
import kotlin.test.BeforeTest
import kotlin.test.assertEquals
@ -64,6 +66,7 @@ import kotlin.test.assertTrue
*
* @author Dino Kadrikj.
*/
@Config(sdk = [Build.VERSION_CODES.M])
@RunWith(RobolectricTestRunner::class)
internal class HumanVerificationTests {

View File

@ -17,6 +17,7 @@
*/
package me.proton.core.network.data
import android.os.Build
import io.mockk.MockKAnnotations
import io.mockk.coEvery
import io.mockk.every
@ -45,6 +46,7 @@ import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.MockWebServer
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import retrofit2.converter.scalars.ScalarsConverterFactory
import java.net.HttpURLConnection
import kotlin.test.AfterTest
@ -56,6 +58,7 @@ import kotlin.test.assertTrue
// Can't use runBlockingTest with MockWebServer. See:
// https://github.com/square/retrofit/issues/3330
// https://github.com/Kotlin/kotlinx.coroutines/issues/1204
@Config(sdk = [Build.VERSION_CODES.M])
@RunWith(RobolectricTestRunner::class)
internal class ProtonApiBackendTests {

View File

@ -176,7 +176,7 @@ open class ProtonAutoCompleteInput : LinearLayout {
binding.input.setAdapter(adapter)
}
override fun setOnClickListener(listener: OnClickListener) {
override fun setOnClickListener(listener: OnClickListener?) {
binding.inputLayout.setOnClickListener(listener)
binding.inputLayout.setEndIconOnClickListener(listener)
binding.input.setOnClickListener(listener)

View File

@ -18,6 +18,7 @@
package me.proton.android.core.presentation.ui.adapter
import android.os.Build
import android.os.Looper.getMainLooper
import android.widget.TextView
import androidx.recyclerview.widget.DiffUtil
@ -26,12 +27,14 @@ import me.proton.core.test.android.executorsTest
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.Shadows.shadowOf
import org.robolectric.annotation.Config
import kotlin.test.Test
import kotlin.test.assertEquals
/**
* Test suite for [ProtonAdapter]
*/
@Config(sdk = [Build.VERSION_CODES.M])
@RunWith(RobolectricTestRunner::class)
internal class ProtonAdapterTest : ExecutorsTest by executorsTest {

View File

@ -18,6 +18,7 @@
package me.proton.android.core.presentation.ui.view
import android.os.Build
import android.view.LayoutInflater
import android.view.View
import android.view.WindowManager
@ -32,6 +33,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.Robolectric
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
@ -39,6 +41,7 @@ import kotlin.test.assertTrue
/**
* Custom input view attributes tests.
*/
@Config(sdk = [Build.VERSION_CODES.M])
@RunWith(RobolectricTestRunner::class)
class ProtonInputAttributesTest {

View File

@ -18,6 +18,7 @@
package me.proton.android.core.presentation.ui.view
import android.os.Build
import android.text.InputType
import android.view.LayoutInflater
import android.view.View
@ -36,12 +37,14 @@ import org.junit.runner.RunWith
import org.robolectric.Robolectric
import org.robolectric.RobolectricTestRunner
import org.robolectric.Shadows.shadowOf
import org.robolectric.annotation.Config
import kotlin.test.assertEquals
import kotlin.test.assertTrue
/**
* Custom input view tests.
*/
@Config(sdk = [Build.VERSION_CODES.M])
@RunWith(RobolectricTestRunner::class)
class ProtonInputTest {

View File

@ -18,6 +18,7 @@
package me.proton.android.core.presentation.ui.view
import android.os.Build
import android.view.WindowManager
import android.widget.FrameLayout
import androidx.appcompat.app.AppCompatActivity
@ -27,6 +28,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.Robolectric
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import kotlin.test.assertFalse
import kotlin.test.assertNull
import kotlin.test.assertTrue
@ -36,6 +38,7 @@ import kotlin.test.assertTrue
*
* @author Dino Kadrikj.
*/
@Config(sdk = [Build.VERSION_CODES.M])
@RunWith(RobolectricTestRunner::class)
class ProtonProgressButtonAttributesTest {

View File

@ -18,6 +18,7 @@
package me.proton.android.core.presentation.ui.view
import android.os.Build
import android.view.View
import android.view.WindowManager
import android.widget.FrameLayout
@ -28,6 +29,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.Robolectric
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertNull
@ -38,6 +40,7 @@ import kotlin.test.assertTrue
*
* @author Dino Kadrikj.
*/
@Config(sdk = [Build.VERSION_CODES.M])
@RunWith(RobolectricTestRunner::class)
class ProtonProgressButtonTest {