Skip to content

Commit

Permalink
AndroidX
Browse files Browse the repository at this point in the history
  • Loading branch information
Jawnnypoo committed Oct 30, 2018
1 parent dc0c1eb commit 5d1cec5
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 95 deletions.
15 changes: 4 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,8 @@ language: android
jdk:
- oraclejdk8

android:
components:
- platform-tools
- tools
- build-tools-24.0.1
- android-24
- extra-android-m2repository
before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"

before_script:
- chmod +x gradlew

script: "./gradlew build"
script: "./gradlew build"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The current version of this helper is derived from `ViewDragHelper` source from
License
--------

Copyright 2016 Commit 451
Copyright 2018 Commit 451

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
11 changes: 4 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion "24.0.1"
compileSdkVersion 28

defaultConfig {
applicationId "com.commit451.betterviewdraghelper.sample"
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand All @@ -23,8 +22,6 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:24.2.0'
compile project(':translationviewdraghelper')
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation project(':translationviewdraghelper')
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.commit451.betterviewdraghelper.sample;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;

import androidx.appcompat.app.AppCompatActivity;

public class MainActivity extends AppCompatActivity {

Expand Down

This file was deleted.

11 changes: 4 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}

allprojects {
repositories {
google()
jcenter()
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Aug 22 15:19:17 CDT 2016
#Tue Oct 30 11:13:29 CDT 2018
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.6-all.zip
9 changes: 3 additions & 6 deletions translationviewdraghelper/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 24
buildToolsVersion "24.0.1"
compileSdkVersion 28

defaultConfig {
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand All @@ -22,9 +21,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:support-compat:24.2.0'
api 'androidx.core:core:1.0.0'
}

apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
package com.commit451.translationviewdraghelper;

import android.content.Context;
import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.VelocityTrackerCompat;
import android.support.v4.view.ViewCompat;
import android.support.v4.widget.ScrollerCompat;
import android.util.Log;
import android.view.MotionEvent;
import android.view.VelocityTracker;
Expand All @@ -32,6 +28,11 @@

import java.util.Arrays;

import androidx.core.view.MotionEventCompat;
import androidx.core.view.VelocityTrackerCompat;
import androidx.core.view.ViewCompat;
import androidx.core.widget.ScrollerCompat;

/**
* Modified version of ViewDragHelper which accounts for if views
* have been translated using {@link View#setX(float)} {@link View#setY(float)} or
Expand Down

This file was deleted.

0 comments on commit 5d1cec5

Please sign in to comment.