Skip to content

Commit 5d1cec5

Browse files
committed
AndroidX
1 parent dc0c1eb commit 5d1cec5

File tree

12 files changed

+25
-95
lines changed

12 files changed

+25
-95
lines changed

.travis.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,8 @@ language: android
33
jdk:
44
- oraclejdk8
55

6-
android:
7-
components:
8-
- platform-tools
9-
- tools
10-
- build-tools-24.0.1
11-
- android-24
12-
- extra-android-m2repository
6+
before_install:
7+
- mkdir "$ANDROID_HOME/licenses" || true
8+
- echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
139

14-
before_script:
15-
- chmod +x gradlew
16-
17-
script: "./gradlew build"
10+
script: "./gradlew build"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The current version of this helper is derived from `ViewDragHelper` source from
4040
License
4141
--------
4242

43-
Copyright 2016 Commit 451
43+
Copyright 2018 Commit 451
4444

4545
Licensed under the Apache License, Version 2.0 (the "License");
4646
you may not use this file except in compliance with the License.

app/build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion "24.0.1"
4+
compileSdkVersion 28
65

76
defaultConfig {
87
applicationId "com.commit451.betterviewdraghelper.sample"
98
minSdkVersion 14
10-
targetSdkVersion 24
9+
targetSdkVersion 28
1110
versionCode 1
1211
versionName "1.0"
1312
}
@@ -23,8 +22,6 @@ android {
2322
}
2423

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

app/src/androidTest/java/com/commit451/betterviewdraghelper/sample/ApplicationTest.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

app/src/main/java/com/commit451/betterviewdraghelper/sample/MainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package com.commit451.betterviewdraghelper.sample;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
5+
import androidx.appcompat.app.AppCompatActivity;
56

67
public class MainActivity extends AppCompatActivity {
78

app/src/test/java/com/commit451/betterviewdraghelper/sample/ExampleUnitTest.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
42
repositories {
3+
google()
54
jcenter()
65
}
76
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.3'
9-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
10-
11-
// NOTE: Do not place your application dependencies here; they belong
12-
// in the individual module build.gradle files
7+
classpath 'com.android.tools.build:gradle:3.2.1'
8+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
139
}
1410
}
1511

1612
allprojects {
1713
repositories {
14+
google()
1815
jcenter()
1916
}
2017
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Aug 22 15:19:17 CDT 2016
1+
#Tue Oct 30 11:13:29 CDT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

translationviewdraghelper/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion "24.0.1"
4+
compileSdkVersion 28
65

76
defaultConfig {
87
minSdkVersion 14
9-
targetSdkVersion 24
8+
targetSdkVersion 28
109
versionCode 1
1110
versionName "1.0"
1211
}
@@ -22,9 +21,7 @@ android {
2221
}
2322

2423
dependencies {
25-
compile fileTree(dir: 'libs', include: ['*.jar'])
26-
testCompile 'junit:junit:4.12'
27-
compile 'com.android.support:support-compat:24.2.0'
24+
api 'androidx.core:core:1.0.0'
2825
}
2926

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

translationviewdraghelper/src/androidTest/java/com/commit451/translationviewdraghelper/ApplicationTest.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)