Skip to content

Commit

Permalink
bugfix:AAR has nothing
Browse files Browse the repository at this point in the history
  • Loading branch information
wshunli committed Oct 16, 2018
1 parent 91754cf commit 6fdf856
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 119 deletions.
19 changes: 0 additions & 19 deletions .idea/gradle.xml

This file was deleted.

48 changes: 0 additions & 48 deletions .idea/misc.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repositories {
}
dependencies {
compile 'com.wshunli.android:android-copy-assets:2.1.0'
implementation 'com.wshunli.android:android-copy-assets:2.2.0'
}
```

Expand Down
12 changes: 7 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion "26.0.3"
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "com.wshunli.android.assets.sample"
minSdkVersion 15
Expand All @@ -35,11 +35,13 @@ android {
}

dependencies {
implementation project(':assets')
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

// implementation project(':assets')
implementation 'com.wshunli.android:android-copy-assets:2.2.0'
}
4 changes: 2 additions & 2 deletions assets/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ apply plugin: 'com.novoda.bintray-release'

android {
compileSdkVersion 26
buildToolsVersion "26.0.3"
buildToolsVersion '27.0.3'
defaultConfig {
minSdkVersion 15
targetSdkVersion 26
Expand All @@ -43,7 +43,7 @@ publish {
userOrg = 'wshunli'
groupId = 'com.wshunli.android'
artifactId = 'android-copy-assets'
publishVersion = '2.1.0'
publishVersion = '2.2.0'
desc = 'Library for copying assets files and folders to the device'
website = 'https://github.com/wshunli/android-copy-assets'
}
4 changes: 4 additions & 0 deletions assets/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

-keep class com.wshunli.assets.CopyAssets { *;}
-keep class com.wshunli.assets.CopyListener { *;}
-keep class com.wshunli.assets.CopyCreator { *;}
10 changes: 0 additions & 10 deletions assets/src/main/java/com/wshunli/assets/CopyAssets.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@

import android.content.Context;

import java.io.BufferedOutputStream;
import java.io.Closeable;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;


public final class CopyAssets {

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.3'


// NOTE: Do not place your application dependencies here; they belong
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 @@
#Sun Dec 17 17:40:40 CST 2017
#Tue Oct 16 08:14:29 CST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 comments on commit 6fdf856

Please sign in to comment.