Fix androidx migration for commandline builds

This commit is contained in:
Martijn Brekhof 2020-04-18 21:18:51 +02:00
parent ebae33755c
commit 6b58ed6495
7 changed files with 27 additions and 6 deletions

1
.gitignore vendored
View File

@ -13,7 +13,6 @@
#/.idea/libraries #/.idea/libraries
# Local configuration file (sdk path, etc) # Local configuration file (sdk path, etc)
gradle.properties
local.properties local.properties
app/keystore.properties app/keystore.properties

View File

@ -4,17 +4,17 @@ sudo: false
env: env:
matrix: matrix:
- ANDROID_TARGET=android-28 - ANDROID_TARGET=android-29
global: global:
- GRADLE_OPTS="-Xms128m" - GRADLE_OPTS="-Xms128m"
android: android:
components: components:
# needed build tools # needed build tools
- build-tools-28.0.3 - build-tools-29.0.2
# The SDK version used to compile your project # The SDK version used to compile your project
- android-28 - android-29
# extra needed components # extra needed components
- extra-android-m2repository - extra-android-m2repository

View File

@ -25,7 +25,7 @@
tools:layout_width="match_parent" tools:layout_width="match_parent"
tools:layout_height="100dp"> tools:layout_height="100dp">
<androidx.constraintlayout.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/relativeLayout" android:id="@+id/relativeLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -97,5 +97,5 @@
app:layout_constraintBottom_toBottomOf="@id/meta_info" app:layout_constraintBottom_toBottomOf="@id/meta_info"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

View File

@ -20,6 +20,7 @@ package org.xbmc.kore.provider.mediaprovider;
import android.content.ContentProviderClient; import android.content.ContentProviderClient;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.pm.ProviderInfo; import android.content.pm.ProviderInfo;
import android.os.Build;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@ -28,12 +29,14 @@ import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostInfo;
import org.xbmc.kore.provider.MediaProvider; import org.xbmc.kore.provider.MediaProvider;
import org.xbmc.kore.testutils.Database; import org.xbmc.kore.testutils.Database;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@Ignore @Ignore
@Config(sdk = 28)
public class AbstractTestClass { public class AbstractTestClass {
protected static HostInfo hostInfo; protected static HostInfo hostInfo;
private static ContentResolver contentResolver = ApplicationProvider.getApplicationContext().getContentResolver(); private static ContentResolver contentResolver = ApplicationProvider.getApplicationContext().getContentResolver();

View File

@ -16,6 +16,7 @@
package org.xbmc.kore.tests.jsonrpc.method; package org.xbmc.kore.tests.jsonrpc.method;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@ -41,6 +42,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@Config(sdk = 28)
public class ApplicationTest { public class ApplicationTest {
private HostConnection hostConnection; private HostConnection hostConnection;

View File

@ -41,6 +41,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@Config(sdk = 28)
public class ApplicationTest { public class ApplicationTest {
private HostConnection hostConnection; private HostConnection hostConnection;

16
gradle.properties Normal file
View File

@ -0,0 +1,16 @@
## For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#Tue Nov 05 20:07:01 CET 2019
org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
android.useAndroidX=true
android.enableJetifier=true