diff --git a/.travis.yml b/.travis.yml
index aec0d42..9243e2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,13 +13,13 @@ android:
- build-tools-28.0.3
# The SDK version used to compile your project
- - android-26
+ - android-28
# Additional components
- extra-google-google_play_services
- extra-google-m2repository
- - extra-android-m2repository
- - addon-google_apis-google-26
+ - extra-android-m2repository
+ - addon-google_apis-google-28
# Specify at least one system image,
# if you need to run emulator(s) during your tests
diff --git a/app/.gitignore b/app/.gitignore
index 796b96d..0c2d8f0 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,4 @@
/build
+/WanAndroid/
+/release/
+/beta/
diff --git a/app/build.gradle b/app/build.gradle
index 50bdf33..b6bee21 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,13 +24,13 @@ static def releaseTime() {
}
android {
- compileSdkVersion 28
+ compileSdkVersion rootProject.targetSdkVersion
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "cf.android666.wanandroid"
- minSdkVersion 21
- targetSdkVersion 28
+ minSdkVersion rootProject.minSdkVersion
+ targetSdkVersion rootProject.targetSdkVersion
versionCode Integer.parseInt(releaseTime())
versionName "1.2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4b59dec..cbcb704 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,28 +5,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build.gradle b/build.gradle
index 55b5cea..00a7928 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,8 @@
buildscript {
ext {
kotlin_version = '1.3.50'
+ targetSdkVersion = 28
+ minSdkVersion = 21
}
repositories {
diff --git a/mylibrary/build.gradle b/mylibrary/build.gradle
index c798c14..7984dc4 100644
--- a/mylibrary/build.gradle
+++ b/mylibrary/build.gradle
@@ -2,20 +2,18 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
android {
- compileSdkVersion 26
-
+ compileSdkVersion rootProject.targetSdkVersion
defaultConfig {
- minSdkVersion 21
- targetSdkVersion 26
+ minSdkVersion rootProject.minSdkVersion
+ targetSdkVersion rootProject.targetSdkVersion
versionCode 2
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
}
- lintOptions{
+ lintOptions {
//停止lint在build时检查
abortOnError false
}
@@ -37,10 +35,10 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'androidx.appcompat:appcompat:1.0.0'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.recyclerview:recyclerview:1.0.0'
}