From 912d149394fc96072905735649327d4101980832 Mon Sep 17 00:00:00 2001 From: Eric Salemi Date: Wed, 4 Nov 2020 13:59:00 +0100 Subject: [PATCH] Bump to version 7.0.1 --- README.md | 2 +- base/build.gradle | 2 +- build.gradle | 2 +- docs/md/manual/gradle.md | 2 +- docs/md/manual/gradleplugin.md | 4 ++-- examples/android-plugin/build.gradle | 2 +- examples/android/build.gradle | 2 +- examples/gradle/android.gradle | 2 +- examples/gradle/applets.gradle | 2 +- examples/gradle/applications.gradle | 2 +- examples/gradle/library.gradle | 2 +- examples/gradle/midlets.gradle | 2 +- examples/gradle/proguard.gradle | 2 +- examples/gradle/proguardgui.gradle | 2 +- examples/gradle/retrace.gradle | 2 +- examples/gradle/scala.gradle | 2 +- examples/gradle/servlets.gradle | 2 +- examples/gradlekotlindsl/build.gradle.kts | 2 +- gradle.properties | 2 ++ 19 files changed, 21 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index a99fcabdd..c6ff47853 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ buildscript { configurations.all { resolutionStrategy { dependencySubstitution { - substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.0') + substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.1') } } } diff --git a/base/build.gradle b/base/build.gradle index 6c5ff4ba4..5102cc8f9 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -28,7 +28,7 @@ sourceSets.main { } dependencies { - compile 'com.guardsquare:proguard-core:7.0.0' + compile "com.guardsquare:proguard-core:${proguardCoreVersion}" compile "com.google.code.gson:gson:${gsonVersion}" } diff --git a/build.gradle b/build.gradle index 5d03f5f87..309af2336 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { allprojects { group = 'com.guardsquare' - version = '7.0.0' + version = proguardVersion } wrapper { diff --git a/docs/md/manual/gradle.md b/docs/md/manual/gradle.md index bd51501cc..23309c47a 100644 --- a/docs/md/manual/gradle.md +++ b/docs/md/manual/gradle.md @@ -10,7 +10,7 @@ line to your **`build.gradle`** file: jcenter() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/docs/md/manual/gradleplugin.md b/docs/md/manual/gradleplugin.md index 3af7aee35..19b26ad40 100644 --- a/docs/md/manual/gradleplugin.md +++ b/docs/md/manual/gradleplugin.md @@ -14,7 +14,7 @@ project you can enable ProGuard instead of the default R8 compiler: configurations.all { resolutionStrategy { dependencySubstitution { - substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.0') + substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.1') } } } @@ -58,7 +58,7 @@ project as follows: } dependencies { classpath 'com.android.tools.build:gradle:3.3.0' - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/android-plugin/build.gradle b/examples/android-plugin/build.gradle index d41aae50d..afc5a9409 100644 --- a/examples/android-plugin/build.gradle +++ b/examples/android-plugin/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { //classpath ':proguard:' // For the local copy of the ProGuard plugin. - classpath 'com.guardsquare:proguard-gradle:7.0.0' // For the copy from Jcenter. + classpath 'com.guardsquare:proguard-gradle:7.0.1' // For the copy from Jcenter. classpath 'com.android.tools.build:gradle:3.3.0' } } diff --git a/examples/android/build.gradle b/examples/android/build.gradle index 75e1f04b2..e6f2504bf 100644 --- a/examples/android/build.gradle +++ b/examples/android/build.gradle @@ -11,7 +11,7 @@ buildscript { // Override the default version of ProGuard // with the most recent one. dependencySubstitution { - substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.0') + substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.1') } } } diff --git a/examples/gradle/android.gradle b/examples/gradle/android.gradle index d167abaf7..fd4a866c0 100644 --- a/examples/gradle/android.gradle +++ b/examples/gradle/android.gradle @@ -20,7 +20,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradle/applets.gradle b/examples/gradle/applets.gradle index 91ee78624..6cd4f4523 100644 --- a/examples/gradle/applets.gradle +++ b/examples/gradle/applets.gradle @@ -13,7 +13,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradle/applications.gradle b/examples/gradle/applications.gradle index ec1c98d10..ce836f37d 100644 --- a/examples/gradle/applications.gradle +++ b/examples/gradle/applications.gradle @@ -13,7 +13,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradle/library.gradle b/examples/gradle/library.gradle index 22c4b4d9d..5323dd1de 100644 --- a/examples/gradle/library.gradle +++ b/examples/gradle/library.gradle @@ -14,7 +14,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradle/midlets.gradle b/examples/gradle/midlets.gradle index 14214ec9b..88f112b63 100644 --- a/examples/gradle/midlets.gradle +++ b/examples/gradle/midlets.gradle @@ -13,7 +13,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradle/proguard.gradle b/examples/gradle/proguard.gradle index 13f520101..752fd3966 100644 --- a/examples/gradle/proguard.gradle +++ b/examples/gradle/proguard.gradle @@ -14,7 +14,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradle/proguardgui.gradle b/examples/gradle/proguardgui.gradle index b96a8620c..725b9a13c 100644 --- a/examples/gradle/proguardgui.gradle +++ b/examples/gradle/proguardgui.gradle @@ -14,7 +14,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradle/retrace.gradle b/examples/gradle/retrace.gradle index 010f70694..a9ee99ea8 100644 --- a/examples/gradle/retrace.gradle +++ b/examples/gradle/retrace.gradle @@ -14,7 +14,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradle/scala.gradle b/examples/gradle/scala.gradle index 88e72144a..cbde6b2d4 100644 --- a/examples/gradle/scala.gradle +++ b/examples/gradle/scala.gradle @@ -14,7 +14,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradle/servlets.gradle b/examples/gradle/servlets.gradle index fd3b9c698..4045c3471 100644 --- a/examples/gradle/servlets.gradle +++ b/examples/gradle/servlets.gradle @@ -13,7 +13,7 @@ buildscript { google() } dependencies { - classpath 'com.guardsquare:proguard-gradle:7.0.0' + classpath 'com.guardsquare:proguard-gradle:7.0.1' } } diff --git a/examples/gradlekotlindsl/build.gradle.kts b/examples/gradlekotlindsl/build.gradle.kts index 23b9adb10..8913e654a 100644 --- a/examples/gradlekotlindsl/build.gradle.kts +++ b/examples/gradlekotlindsl/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { // TODO: required due to https://github.com/Guardsquare/proguard/issues/30 classpath("com.android.tools.build:gradle:3.0.0") - classpath("com.guardsquare:proguard-gradle:7.0.0") + classpath("com.guardsquare:proguard-gradle:7.0.1") } } diff --git a/gradle.properties b/gradle.properties index ce0582ef1..1d47a1d76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,5 @@ +proguardVersion = 7.0.1 +proguardCoreVersion = 7.0.1 gsonVersion = 2.8.5 kotlinVersion = 1.3.31 kotlinxMetadataVersion = 0.1.0