Skip to content
Permalink
Browse files

Migrate to AndroidX (and relevant updates) (#72)

Summary:
- AndroidX migration
- Updated targetsdk/compilesdk to 28
- Updated gradle wrapper
- Updated kotlin to 1.3.10
Pull Request resolved: #72

Reviewed By: sjkirby

Differential Revision: D15968792

Pulled By: xiphirx

fbshipit-source-id: 72790ef3b287e01b38af1d22066f74a7fa82a4f6
  • Loading branch information...
mkano9 authored and facebook-github-bot committed Jun 24, 2019
1 parent 74e950e commit cd1148d869e5d240b1299cc2b7a451bb1d557e18
@@ -18,3 +18,6 @@ POM_DEVELOPER_ID=facebook
POM_DEVELOPER_NAME=Facebook

org.gradle.configureondemand=true

android.useAndroidX=true
android.enableJetifier=false
@@ -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-4.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
@@ -11,7 +11,7 @@ android {
}

dependencies {
implementation deps.supportAnnotations
implementation deps.androidXAnnotations
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
@@ -12,11 +12,11 @@
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.RectF;
import android.support.annotation.ColorInt;
import android.support.annotation.FloatRange;
import android.support.annotation.IntDef;
import android.support.annotation.Px;
import android.util.AttributeSet;
import androidx.annotation.ColorInt;
import androidx.annotation.FloatRange;
import androidx.annotation.IntDef;
import androidx.annotation.Px;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

@@ -20,8 +20,8 @@
import android.graphics.Rect;
import android.graphics.Shader;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

public final class ShimmerDrawable extends Drawable {
private final ValueAnimator.AnimatorUpdateListener mUpdateListener =
@@ -14,10 +14,10 @@
import android.graphics.Paint;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

/**
* Shimmer is an Android library that provides an easy way to add a shimmer effect to any {@link
@@ -1,22 +1,22 @@
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
ext {
versions = [
targetSdk : 26,
compileSdk : 26,
targetSdk : 28,
compileSdk : 28,
minSdk : 14,
buildTools : '26.0.2',
kotlin : '1.2.41',
supportLibrary: '27.0.2',
buildTools : '28.0.3',
kotlin : '1.3.10',
androidXAnnotations: '1.0.1',
]

plugs = [
"agp" : "com.android.tools.build:gradle:3.0.1",
"agp" : "com.android.tools.build:gradle:3.2.1",
"kotlin": "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
]

deps = [
shimmer : "com.facebook.shimmer:shimmer:$VERSION_NAME",
kotlinStdlib : "org.jetbrains.kotlin:kotlin-stdlib-jre7:${versions.kotlin}",
supportAnnotations: "com.android.support:support-annotations:${versions.supportLibrary}",
shimmer : "com.facebook.shimmer:shimmer:$VERSION_NAME",
kotlinStdlib : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}",
androidXAnnotations : "androidx.annotation:annotation:${versions.androidXAnnotations}",
]
}

0 comments on commit cd1148d

Please sign in to comment.
You can’t perform that action at this time.