Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ def safeExtGet(prop, fallback) {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 25)
buildToolsVersion safeExtGet("buildToolsVersion", '25.0.2')
compileSdkVersion safeExtGet("compileSdkVersion", 28)

defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 16)
targetSdkVersion safeExtGet('targetSdkVersion', 25)
targetSdkVersion safeExtGet('targetSdkVersion', 28)
versionCode 1
versionName "1.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import java.util.Arrays;
import java.util.Comparator;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

public class GestureHandlerOrchestrator {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactRootView;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

public class RNGestureHandlerEnabledRootView extends ReactRootView {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.swmansion.gesturehandler.react;

import android.support.v4.util.Pools;
import androidx.core.util.Pools;

import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
import com.facebook.react.uimanager.events.RCTEventEmitter;
import com.swmansion.gesturehandler.GestureHandler;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

public class RNGestureHandlerEvent extends Event<RNGestureHandlerEvent> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import java.util.List;
import java.util.Map;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

import static com.swmansion.gesturehandler.GestureHandler.HIT_SLOP_NONE;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import java.util.List;
import java.util.Map;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

public class RNGestureHandlerPackage implements ReactPackage {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import java.util.ArrayList;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

public class RNGestureHandlerRegistry implements GestureHandlerRegistry {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.swmansion.gesturehandler.react;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

public interface RNGestureHandlerRootInterface {
@Nullable RNGestureHandlerRootHelper getRootHelper();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.views.view.ReactViewGroup;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

public class RNGestureHandlerRootView extends ReactViewGroup {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import java.util.Map;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

/**
* React native's view manager used for creating instances of {@link }RNGestureHandlerRootView}. It
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.swmansion.gesturehandler.react;

import android.support.v4.util.Pools;
import androidx.core.util.Pools;

import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
import com.facebook.react.uimanager.events.RCTEventEmitter;
import com.swmansion.gesturehandler.GestureHandler;

import javax.annotation.Nullable;
import androidx.annotation.Nullable;

public class RNGestureHandlerStateChangeEvent extends Event<RNGestureHandlerStateChangeEvent>{

Expand Down