Skip to content

Commit

Permalink
删除无用配置。
Browse files Browse the repository at this point in the history
  • Loading branch information
langmanleguang@qq.com committed May 15, 2018
1 parent 4798be2 commit dad6362
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 21 deletions.
13 changes: 6 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.3"
defaultConfig {
applicationId "cn.itsite.aguider.demo"
minSdkVersion 19
Expand All @@ -20,12 +19,12 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
testCompile 'junit:junit:4.12'
compile project(':library')
implementation 'com.android.support:appcompat-v7:25.3.1'
implementation 'com.android.support:design:25.3.1'
testImplementation 'junit:junit:4.12'
implementation project(':library')
}
8 changes: 8 additions & 0 deletions app/src/main/gen/cn/itsite/aguider/demo/BuildConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*___Generated_by_IDEA___*/

package cn.itsite.aguider.demo;

/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}
7 changes: 7 additions & 0 deletions app/src/main/gen/cn/itsite/aguider/demo/Manifest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*___Generated_by_IDEA___*/

package cn.itsite.aguider.demo;

/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}
7 changes: 7 additions & 0 deletions app/src/main/gen/cn/itsite/aguider/demo/R.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*___Generated_by_IDEA___*/

package cn.itsite.aguider.demo;

/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.1.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
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 @@
#Fri Nov 24 09:05:49 CST 2017
#Tue May 15 17:00:46 CST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
9 changes: 4 additions & 5 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion 25
buildToolsVersion "25.0.3"

defaultConfig {
minSdkVersion 19
Expand All @@ -22,10 +21,10 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.3.1'
testCompile 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:25.3.1'
testImplementation 'junit:junit:4.12'
}
7 changes: 1 addition & 6 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cn.itsite.aguider">
<manifest package="cn.itsite.aguider" />

<application android:allowBackup="true" android:label="@string/app_name"
android:supportsRtl="true">
</application>

</manifest>

0 comments on commit dad6362

Please sign in to comment.