From 67b1d3837cc1b971a898725b4919e3ab361e5ea5 Mon Sep 17 00:00:00 2001
From: unknown <zhouliuyang1995@163.com>
Date: Mon, 3 Jan 2022 11:33:36 +0800
Subject: [PATCH] =?UTF-8?q?1.1.1=20=E4=BF=AE=E5=A4=8Drelease=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=BF=90=E8=A1=8C=E5=92=8C=E6=89=93=E5=8C=85=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复release无法和打包问题
---
 README.md                       | 19 ++++++++++++++++++-
 build.gradle                    |  2 +-
 data/template/app/build2.gradle |  3 +++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fa11e59..efb2cee 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,19 @@ gradlew outputProject
 
 不想构建工具？直接点击下载：
 
-[V1.1.0](http://mosect.com/assets/apk2gradle/apk2gradle-1.1.0.zip)
+[V1.1.1](http://mosect.com/assets/apk2gradle/apk2gradle-1.1.1.zip)
+
+## 更新计划
+**V1.2.0**
+```
+1. 支持smali、java混合开发
+```
 
 ## 更新记录
+**V1.1.1**
+```
+1. 修复release无法运行或者打包出错问题
+```
 **V1.1.0**
 ```
 1. 改用aar方式导入原apk资源文件，相关文件：res.aar
@@ -34,6 +44,13 @@ gradlew outputProject
 5. 更新apktool工具，此工具为修改后版本，增加参数 -r-txt 来输出aar的R.txt
 ```
 
+## 已知问题
+**V1.1.0**
+```
+1. debug无法直接运行，后续版本修改
+2. release运行出错或者无法打包，V1.1.1版本已修复
+```
+
 ## 使用工具：
 进入工具目录，执行：
 ```
diff --git a/build.gradle b/build.gradle
index eeb5014..4028260 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
 apply plugin: 'java-library'
 apply plugin: 'com.github.johnrengelman.shadow'
 
-def appVersion = '1.1.0'
+def appVersion = '1.1.1'
 def appName = 'apk2gradle'
 
 dependencies {
diff --git a/data/template/app/build2.gradle b/data/template/app/build2.gradle
index 8dec256..2e79246 100644
--- a/data/template/app/build2.gradle
+++ b/data/template/app/build2.gradle
@@ -250,6 +250,9 @@ tasks.whenTaskAdded {
             Document manifest = readXml(file('src/main/AndroidManifest.xml'))
             String packageName = manifest.getDocumentElement().getAttribute("package")
             cur.outputs.files.each {
+                if (it.isFile()) {
+                    return
+                }
                 // 生成新的smali
                 def newSmaliList = dumpDexDir(it, new File(buildDir, "smali/${variantName}/_new"))