diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/duckduckgo.benchmark.kts b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/duckduckgo.benchmark.kts index 002286ab324..7fbd28c9e8a 100644 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/duckduckgo.benchmark.kts +++ b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/duckduckgo.benchmark.kts @@ -4,14 +4,14 @@ @file:BenchmarkProject( name = "duckduckgo", gitUrl = "https://github.com/duckduckgo/Android.git", - gitCommitSha = "18e230fcefbefb4317c1fe128b4539a2315e7c0a", - stableKotlinVersion = "1.7.20", + gitCommitSha = "43bc063d9c044f2ca4a9eae1836cc783fcc7121c", + stableKotlinVersion = "1.8.0", ) import java.io.File val repoPatch = { - "duckduckgo-kotlin-current.patch" to File("benchmarkScripts/files/duckduckgo-kotlin-current.patch") + "duckduckgo-kotlin-repo.patch" to File("benchmarkScripts/files/duckduckgo-kotlin-repo.patch") .readText() .run { replace("", currentKotlinVersion) } .byteInputStream() @@ -41,15 +41,15 @@ runBenchmarks( useGradleArgs("--no-build-cache") runTasks(":app:assemblePlayDebug") - applyAbiChangeTo("app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/network/VpnNetworkModule.kt") + applyAbiChangeTo("app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/di/VpnModule.kt") } scenario { - title = "Incremental build with ABI change in Kapt component" + title = "Incremental build with non ABI change in Kapt component" useGradleArgs("--no-build-cache") runTasks(":app:assemblePlayDebug") - applyNonAbiChangeTo("app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/network/VpnNetworkModule.kt") + applyNonAbiChangeTo("app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/di/VpnModule.kt") } scenario { @@ -58,28 +58,25 @@ runBenchmarks( runTasks(":app:assemblePlayDebug") - applyAndroidResourceValueChange("common-ui/src/main/res/values/strings.xml") + applyAndroidResourceValueChange("common/src/main/res/values/strings-common.xml") } scenario { title = "Dry run configuration time" useGradleArgs("-m") - iterations = 20 runTasks(":app:assemblePlayDebug") } scenario { title = "No-op configuration time" - iterations = 20 runTasks("help") } scenario { title = "UP-TO-DATE configuration time" - iterations = 20 runTasks(":app:assemblePlayDebug") } } diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/duckduckgo-kotlin-1.7.20.patch b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/duckduckgo-kotlin-1.7.20.patch deleted file mode 100644 index 478dbdb83de..00000000000 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/duckduckgo-kotlin-1.7.20.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index be987782b..f59d7e0db 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -2,7 +2,7 @@ - buildscript { - - ext { -- kotlin_version = '1.7.10' -+ kotlin_version = '1.7.20' - spotless = "6.1.2" - anvil_version = "2.4.1" - gradle_plugin = "7.2.2" // When updating, also update lint_version -@@ -120,4 +120,4 @@ fladle { - } - } - --apply plugin: 'android-reporting' -\ No newline at end of file -+apply plugin: 'android-reporting' -diff --git a/versions.properties b/versions.properties -index 0bdde3fdb..c41dc1dc5 100644 ---- a/versions.properties -+++ b/versions.properties -@@ -75,7 +75,7 @@ version.jakewharton.rxrelay2=2.0.0 - - version.jakewharton.timber=5.0.1 - --version.kotlin=1.7.10 -+version.kotlin=1.7.20 - - version.kotlinx.coroutines=1.6.4 - diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/duckduckgo-kotlin-current.patch b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/duckduckgo-kotlin-current.patch deleted file mode 100644 index cd86401d989..00000000000 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/duckduckgo-kotlin-current.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index be987782b..417b6c88d 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -2,7 +2,7 @@ - buildscript { - - ext { -- kotlin_version = '1.7.10' -+ kotlin_version = '' - spotless = "6.1.2" - anvil_version = "2.4.1" - gradle_plugin = "7.2.2" // When updating, also update lint_version -@@ -14,6 +14,7 @@ buildscript { - } - - repositories { -+ mavenLocal() - google() - mavenCentral() - maven { url "https://plugins.gradle.org/m2/" } -@@ -35,6 +36,7 @@ plugins { - - allprojects { - repositories { -+ mavenLocal() - google() - mavenCentral() - } -@@ -120,4 +122,4 @@ fladle { - } - } - --apply plugin: 'android-reporting' -\ No newline at end of file -+apply plugin: 'android-reporting' -diff --git a/versions.properties b/versions.properties -index 0bdde3fdb..dff5e798f 100644 ---- a/versions.properties -+++ b/versions.properties -@@ -75,7 +75,7 @@ version.jakewharton.rxrelay2=2.0.0 - - version.jakewharton.timber=5.0.1 - --version.kotlin=1.7.10 -+version.kotlin= - - version.kotlinx.coroutines=1.6.4 - diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/duckduckgo-kotlin-repo.patch b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/duckduckgo-kotlin-repo.patch new file mode 100644 index 00000000000..8e0bfe2ec00 --- /dev/null +++ b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/duckduckgo-kotlin-repo.patch @@ -0,0 +1,70 @@ +diff --git a/build.gradle b/build.gradle +index 738db1cd9..a79b8a479 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -3,9 +3,8 @@ + buildscript { + + ext { +- kotlin_version = '1.7.10' + spotless = "6.1.2" +- anvil_version = "2.4.1" ++ anvil_version = "2.4.4" + gradle_plugin = "7.2.2" // When updating, also update lint_version + lint_version = "30.2.2" // This value must always be gradle_plugin + 23 + min_sdk = 23 +@@ -16,6 +15,7 @@ buildscript { + } + + repositories { ++ mavenLocal() + google() + mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } +@@ -24,7 +24,7 @@ buildscript { + classpath "com.android.tools.build:gradle:$gradle_plugin" + classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotless" + classpath "com.squareup.anvil:gradle-plugin:$anvil_version" +- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" ++ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files +@@ -38,6 +38,7 @@ plugins { + + allprojects { + repositories { ++ mavenLocal() + google() + mavenCentral() + } +@@ -139,4 +140,4 @@ fladle { + } + } + +-apply plugin: 'android-reporting' +\ No newline at end of file ++apply plugin: 'android-reporting' +diff --git a/gradle.properties b/gradle.properties +index 709ee46cd..272c1dd8f 100644 +--- a/gradle.properties ++++ b/gradle.properties +@@ -21,3 +21,4 @@ org.gradle.caching=true + org.gradle.parallel=true + org.gradle.configureondemand=true + ++kotlinVersion= +diff --git a/versions.properties b/versions.properties +index 8cdd45631..dd1f42aaf 100644 +--- a/versions.properties ++++ b/versions.properties +@@ -77,7 +77,8 @@ version.jakewharton.rxrelay2=2.0.0 + + version.jakewharton.timber=5.0.1 + +-version.kotlin=1.7.10 ++version.kotlin=1.8.0 ++## # available=1.8.255-SNAPSHOT + + version.kotlinx.coroutines=1.6.4 +