diff --git a/build.gradle b/build.gradle index b34c263..cbf481d 100644 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,8 @@ repositories { dependencies { compile gradleApi() compile localGroovy() -// compile 'com.android.tools.build:gradle:2.3.0' + compile 'com.android.tools.build:gradle:2.2.3' compile 'com.android.tools.build:transform-api:1.5.0' compile 'com.squareup:javapoet:1.8.0' compile 'org.jooq:joor:0.9.6' -} \ No newline at end of file +} diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/groovy/me/vigi/fataar/ExplodedHelper.groovy b/src/main/groovy/me/vigi/fataar/ExplodedHelper.groovy index 2408d52..6e966cc 100644 --- a/src/main/groovy/me/vigi/fataar/ExplodedHelper.groovy +++ b/src/main/groovy/me/vigi/fataar/ExplodedHelper.groovy @@ -1,6 +1,7 @@ package me.vigi.fataar import org.gradle.api.Project +import org.gradle.api.artifacts.ResolvedArtifact /** * Created by Vigi on 2017/1/20. @@ -8,7 +9,7 @@ import org.gradle.api.Project class ExplodedHelper { public static void processIntoJars(Project project, - Collection androidLibraries, Collection jarFiles, + Collection androidLibraries, Collection jarFiles, File folderOut) { for (androidLibrary in androidLibraries) { if (!androidLibrary.rootFolder.exists()) { @@ -16,7 +17,7 @@ class ExplodedHelper { continue } // println 'fat-aar-->copy aar from: ' + androidLibrary.rootFolder - def prefix = androidLibrary.name + '-' + androidLibrary.version + def prefix = androidLibrary.group + '-' + androidLibrary.name + '-' + androidLibrary.version project.copy { from(androidLibrary.classesJarFile) into folderOut @@ -28,23 +29,26 @@ class ExplodedHelper { rename { prefix + '-' + it } } } - for (jarFile in jarFiles) { - if (!jarFile.exists()) { - println 'fat-aar-->[warning]' + jarFile + ' not found!' + for (ResolvedArtifact jarFile in jarFiles) { + if (!jarFile.file.exists()) { + println 'fat-aar-->[warning] ' + jarFile.file + ' not found!' continue } + def id = jarFile.getModuleVersion().getId() + def prefix = id.group + '-' + id.name + '-' + id.version // println 'fat-aar-->copy jar from: ' + jarFile project.copy { - from(jarFile) + from(jarFile.file) into folderOut + rename { prefix + '-' + it } } } } public static void processIntoClasses(Project project, - Collection androidLibraries, Collection jarFiles, + Collection androidLibraries, Collection jarFiles, File folderOut) { - Collection allJarFiles = new ArrayList<>() + Collection allJarFiles = new ArrayList<>() for (androidLibrary in androidLibraries) { if (!androidLibrary.rootFolder.exists()) { println 'fat-aar-->[warning]' + androidLibrary.rootFolder + ' not found!' @@ -53,17 +57,17 @@ class ExplodedHelper { allJarFiles.add(androidLibrary.classesJarFile) allJarFiles.addAll(androidLibrary.localJars) } - for (jarFile in jarFiles) { - if (!jarFile.exists()) { - println 'fat-aar-->[warning]' + jarFile + ' not found!' + for (ResolvedArtifact jarFile in jarFiles) { + if (!jarFile.file.exists()) { + println 'fat-aar-->[warning] ' + jarFile.file + ' not found!' continue } allJarFiles.add(jarFile) } - for (jarFile in allJarFiles) { -// println 'fat-aar-->copy classes from: ' + jarFile + for (ResolvedArtifact jarFile in allJarFiles) { +// println 'fat-aar-->copy classes from: ' + jarFile.file project.copy { - from project.zipTree(jarFile) + from project.zipTree(jarFile.file) into folderOut include '**/*.class' exclude 'META-INF/' diff --git a/src/main/groovy/me/vigi/fataar/FatLibraryPlugin.groovy b/src/main/groovy/me/vigi/fataar/FatLibraryPlugin.groovy index de65666..37cd689 100644 --- a/src/main/groovy/me/vigi/fataar/FatLibraryPlugin.groovy +++ b/src/main/groovy/me/vigi/fataar/FatLibraryPlugin.groovy @@ -90,7 +90,7 @@ class FatLibraryPlugin implements Plugin { processor.addAndroidArchiveLibrary(archiveLibrary) } if ('jar'.equals(artifact.type)) { - processor.addJarFile(artifact.file) + processor.addJarFile(artifact) } } processor.processVariant() diff --git a/src/main/groovy/me/vigi/fataar/VariantProcessor.groovy b/src/main/groovy/me/vigi/fataar/VariantProcessor.groovy index eaabe81..f9450d4 100644 --- a/src/main/groovy/me/vigi/fataar/VariantProcessor.groovy +++ b/src/main/groovy/me/vigi/fataar/VariantProcessor.groovy @@ -2,6 +2,7 @@ package me.vigi.fataar import org.gradle.api.Project import org.gradle.api.Task +import org.gradle.api.artifacts.ResolvedArtifact /** * Created by Vigi on 2017/2/24. @@ -14,7 +15,7 @@ class VariantProcessor { private Collection mAndroidArchiveLibraries = new ArrayList<>() - private Collection mJarFiles = new ArrayList<>() + private Collection mJarFiles = new ArrayList<>() public VariantProcessor(Project project, variant) { mProject = project @@ -25,7 +26,7 @@ class VariantProcessor { mAndroidArchiveLibraries.add(library) } - public void addJarFile(File jar) { + public void addJarFile(ResolvedArtifact jar) { mJarFiles.add(jar) } diff --git a/src/main/java/me/vigi/fataar/TestTransform.java b/src/main/java/me/vigi/fataar/TestTransform.java index 3fd570b..841d997 100644 --- a/src/main/java/me/vigi/fataar/TestTransform.java +++ b/src/main/java/me/vigi/fataar/TestTransform.java @@ -24,12 +24,12 @@ public Set getInputTypes() { } @Override - public Set getScopes() { + public Set getScopes() { return ImmutableSet.of(); } @Override - public Set getReferencedScopes() { + public Set getReferencedScopes() { return ImmutableSet.of( // QualifiedContent.Scope.PROJECT, // current project classes dir // QualifiedContent.Scope.PROJECT_LOCAL_DEPS, // local jars