Skip to content

Commit

Permalink
迁移到AndroidX
Browse files Browse the repository at this point in the history
  • Loading branch information
yilylong committed Apr 27, 2020
1 parent d6ea5ab commit adc9aa9
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 28 deletions.
10 changes: 5 additions & 5 deletions Userguidelibrary/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven'
group='com.github.yilylong'

android {
compileSdkVersion 25
buildToolsVersion "25.0.3"
compileSdkVersion 28
buildToolsVersion "28.0.3"

defaultConfig {
minSdkVersion 14
targetSdkVersion 22
targetSdkVersion 26
versionCode 1
versionName "1.0"
}
Expand All @@ -30,8 +30,8 @@ android {


dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.0.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.0.0'
}


Expand Down
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "25.0.1"
compileSdkVersion 28
buildToolsVersion "28.0.3"

defaultConfig {
applicationId "com.zhl.userguideview"
minSdkVersion 15
targetSdkVersion 22
targetSdkVersion 26
versionCode 1
versionName "1.0"
}
Expand All @@ -20,11 +20,11 @@ android {
}

dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:23.0.1'
implementation 'com.android.support:design:23.0.1'
compile project(':Userguidelibrary')
implementation 'com.zhl.cbpullrefresh:CBPullRefreshLibrary:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation project(':Userguidelibrary')
// implementation 'com.zhl.cbpullrefresh:CBPullRefreshLibrary:1.0.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.zhl.cbpullrefresh.CBPullRefreshListView;
import com.zhl.userguideview.userguideview.R;

import java.util.LinkedHashMap;
Expand All @@ -24,7 +23,6 @@ public class UserGuideTestActivity extends Activity {
GridView mGridView;
private UserGuideView guideView;
private ImageView bottom, topLeft, top,topRight ,bottomLeft, bottomRight;
private CBPullRefreshListView listView;
View tipTextView;

@Override
Expand Down
14 changes: 4 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,19 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
// NOTE: Do not place your application dependencies here; they belong
}
}

allprojects {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
}
}

Expand Down
4 changes: 4 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@
# org.gradle.parallel=true
# gradlew bintrayUpload
#gradlew clean build bintrayUpload -PbintrayUser=yilylong -PbintrayKey=xxxxxxxxxxxxxxxxxxxxxx -PdryRun=false

android.enableJetifier=true
android.useAndroidX = true
#android.enableJetifier = true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

0 comments on commit adc9aa9

Please sign in to comment.