diff --git a/android/build.gradle b/android/build.gradle index db16ed91..4f26736a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.3.1' } } @@ -18,8 +18,8 @@ def safeExtGet(prop, fallback) { } android { - compileSdkVersion safeExtGet('compileSdkVersion', 26) - buildToolsVersion safeExtGet('buildToolsVersion', '26.0.3') + compileSdkVersion safeExtGet('compileSdkVersion', 28) + buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3') defaultConfig { minSdkVersion safeExtGet('minSdkVersion', 16) @@ -40,11 +40,14 @@ repositories { url "$projectDir/../node_modules/react-native/android" } mavenCentral() + mavenLocal() + google() + jcenter() + } dependencies { implementation 'com.facebook.react:react-native:+' - implementation "com.android.support:appcompat-v7:${safeExtGet('supportLibVersion', '26.+')}" } def configureReactNativePom(def pom) { diff --git a/android/gradle.properties b/android/gradle.properties index fd8bcba9..6d64cecc 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -18,3 +18,5 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro # org.gradle.parallel=true android.useDeprecatedNdk=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index dbdc05d2..bdc3b85f 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip \ No newline at end of file diff --git a/android/src/main/java/com/swmansion/rnscreens/LifecycleHelper.java b/android/src/main/java/com/swmansion/rnscreens/LifecycleHelper.java index 73695ff5..a35b2a7d 100644 --- a/android/src/main/java/com/swmansion/rnscreens/LifecycleHelper.java +++ b/android/src/main/java/com/swmansion/rnscreens/LifecycleHelper.java @@ -1,16 +1,12 @@ package com.swmansion.rnscreens; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.LifecycleObserver; -import android.support.v4.app.Fragment; -import android.util.Log; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.fragment.app.Fragment; + import android.view.View; import android.view.ViewParent; -import com.facebook.react.modules.core.ChoreographerCompat; -import com.facebook.react.modules.core.ReactChoreographer; - -import java.util.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/android/src/main/java/com/swmansion/rnscreens/Screen.java b/android/src/main/java/com/swmansion/rnscreens/Screen.java index 0c121dac..b64380da 100644 --- a/android/src/main/java/com/swmansion/rnscreens/Screen.java +++ b/android/src/main/java/com/swmansion/rnscreens/Screen.java @@ -1,15 +1,16 @@ package com.swmansion.rnscreens; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Paint; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; -import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; + import com.facebook.react.uimanager.PointerEvents; import com.facebook.react.uimanager.ReactPointerEventsView; diff --git a/android/src/main/java/com/swmansion/rnscreens/ScreenContainer.java b/android/src/main/java/com/swmansion/rnscreens/ScreenContainer.java index 82701084..d10ad6db 100644 --- a/android/src/main/java/com/swmansion/rnscreens/ScreenContainer.java +++ b/android/src/main/java/com/swmansion/rnscreens/ScreenContainer.java @@ -1,18 +1,16 @@ package com.swmansion.rnscreens; -import android.app.Activity; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentTransaction; + import android.content.Context; import android.content.ContextWrapper; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; import android.view.ViewGroup; import android.view.ViewParent; import com.facebook.react.ReactRootView; -import com.facebook.react.bridge.ReactContext; import com.facebook.react.modules.core.ChoreographerCompat; import com.facebook.react.modules.core.ReactChoreographer;