From 63fe5b1ebcac003b7b7aeff7054233704e5b4942 Mon Sep 17 00:00:00 2001 From: Maxim Bachinsky Date: Mon, 8 Apr 2019 14:59:33 +0300 Subject: [PATCH 1/5] lint. ignore lib new version (#95) --- lint/lint.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lint/lint.xml b/lint/lint.xml index 80f8723..85c9609 100644 --- a/lint/lint.xml +++ b/lint/lint.xml @@ -149,7 +149,7 @@ - + @@ -270,4 +270,4 @@ - \ No newline at end of file + From 05ed714e9f9dd228662a98cc909d1e8175e02e71 Mon Sep 17 00:00:00 2001 From: Ivan Vlasov Date: Mon, 8 Apr 2019 22:28:01 +0300 Subject: [PATCH 2/5] Proguard rules for Kaspersky KFP Facade (#96) --- proguard/common.pro | 1 + proguard/rules/kaspersky.pro | 1 + 2 files changed, 2 insertions(+) create mode 100644 proguard/rules/kaspersky.pro diff --git a/proguard/common.pro b/proguard/common.pro index 1de1390..937bc37 100644 --- a/proguard/common.pro +++ b/proguard/common.pro @@ -5,3 +5,4 @@ -include rules/logansquare.pro -include rules/crashlytics.pro -include rules/glide.pro +-include rules/kaspersky.pro diff --git a/proguard/rules/kaspersky.pro b/proguard/rules/kaspersky.pro new file mode 100644 index 0000000..3a9094b --- /dev/null +++ b/proguard/rules/kaspersky.pro @@ -0,0 +1 @@ +-dontwarn com.kavsdk.* From 041af69465ebec5b6cd288f5cb5f675ddd409449 Mon Sep 17 00:00:00 2001 From: Ivan Vlasov Date: Tue, 9 Apr 2019 19:21:08 +0300 Subject: [PATCH 3/5] Additional Proguard rules for Kaspersky (#97) --- proguard/rules/kaspersky.pro | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/proguard/rules/kaspersky.pro b/proguard/rules/kaspersky.pro index 3a9094b..83fab7c 100644 --- a/proguard/rules/kaspersky.pro +++ b/proguard/rules/kaspersky.pro @@ -1 +1,8 @@ -dontwarn com.kavsdk.* +-keep class com.kavsdk.** { *; } + +-dontwarn com.kaspersky.* +-keep class com.kaspersky.** { *; } + +-dontwarn com.kms.* +-keep class com.kms.** { *; } \ No newline at end of file From d4a7dce0d7f17617efb3dffa4ca7f64ec8a85e9f Mon Sep 17 00:00:00 2001 From: Maxim Bachinsky Date: Fri, 12 Apr 2019 12:20:19 +0300 Subject: [PATCH 4/5] lint. NewerVersionAvailable to warning --- lint/lint.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lint/lint.xml b/lint/lint.xml index 85c9609..7968d66 100644 --- a/lint/lint.xml +++ b/lint/lint.xml @@ -4,9 +4,6 @@ - - - @@ -181,6 +178,7 @@ + From e6608abb28e9c683e9c59c263a2713b7b172d385 Mon Sep 17 00:00:00 2001 From: Ivan Smolin Date: Thu, 18 Apr 2019 23:12:50 +0300 Subject: [PATCH 5/5] don't wipe carthage cache anymore --- xcode/commonFastfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xcode/commonFastfile b/xcode/commonFastfile index 58d7604..302cbe4 100644 --- a/xcode/commonFastfile +++ b/xcode/commonFastfile @@ -11,10 +11,7 @@ before_all do |lane, options| end if File.exists? "../Cartfile" - # wipe swift 4.x builded binaries - sh("rm -rf ~/Library/Caches/org.carthage.CarthageKit") - - carthage(command: "update", platform: "iOS") + carthage(command: "bootstrap", platform: "iOS") end cocoapods(