diff --git a/GBDaoGenerator/build.gradle b/GBDaoGenerator/build.gradle index 609846799..4b36de942 100644 --- a/GBDaoGenerator/build.gradle +++ b/GBDaoGenerator/build.gradle @@ -32,3 +32,11 @@ artifacts { } sourceCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7 + +tasks.named("distTar") { + duplicatesStrategy = 'include' +} + +tasks.named("distZip") { + duplicatesStrategy = 'include' +} diff --git a/app/build.gradle b/app/build.gradle index 257990258..1b8a955ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -104,7 +104,7 @@ dependencies { implementation 'com.jaredrummler:colorpicker:1.0.2' // implementation project(":DaoCore") implementation 'com.github.wax911:android-emojify:0.1.7' - implementation 'com.google.protobuf:protobuf-lite:3.0.0' + implementation 'com.google.protobuf:protobuf-lite:3.0.1' implementation "androidx.multidex:multidex:2.0.1" }