From 6a363fd5ba97b19c65ceac1c3e0b2f95944aa7ab Mon Sep 17 00:00:00 2001 From: Guillaume Jacquart Date: Sat, 3 Dec 2022 11:53:55 +0100 Subject: [PATCH 1/2] 5538: fix stop orbot cancel all notification of the package. --- build.gradle | 3 ++- orbotservice | 2 +- privacymoduletor/build.gradle | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 23001fb..42ca21c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,8 @@ buildscript { ext.kotlin_version = "1.6.10" ext.orbot_version = "orbot-16.6.2" - ext.advanced_privacy_version = "1.6.0-dev" + ext.orbot_service_patch_version = "2" + ext.advanced_privacy_version = "1.7.0" repositories { google() diff --git a/orbotservice b/orbotservice index 788bbd1..58bdb85 160000 --- a/orbotservice +++ b/orbotservice @@ -1 +1 @@ -Subproject commit 788bbd1272467ed0cc523c0d5921af9ca1a09707 +Subproject commit 58bdb85984314967b5a82202823063f24ba7cd10 diff --git a/privacymoduletor/build.gradle b/privacymoduletor/build.gradle index c7cf6ff..a739a37 100644 --- a/privacymoduletor/build.gradle +++ b/privacymoduletor/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation 'androidx.core:core-ktx:1.8.0' implementation(libs.androidx_localbroadcast) - implementation "foundation.e:orbotservice:$orbot_version" + implementation "foundation.e:orbotservice:$orbot_version-$orbot_service_patch_version" } -- GitLab From 128d0ad6b9cea0018cf30afedf6f3573e4c2b61c Mon Sep 17 00:00:00 2001 From: Guillaume Jacquart Date: Tue, 6 Dec 2022 05:17:04 +0100 Subject: [PATCH 2/2] MR naming suggetions, Fix orbotservice version --- build.gradle | 4 ++-- privacymoduletor/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 42ca21c..2b8e34c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext.kotlin_version = "1.6.10" ext.orbot_version = "orbot-16.6.2" - ext.orbot_service_patch_version = "2" + ext.orbot_service_revision = "2" ext.advanced_privacy_version = "1.7.0" repositories { @@ -26,7 +26,7 @@ configure(project(':orbotservice')) { groupId 'foundation.e' //You can either define these here or get them from project conf elsewhere artifactId 'orbotservice' - version orbot_version + version "$orbot_version-$orbot_service_revision" artifact "$buildDir/outputs/aar/orbotservice-release.aar" //aar artifact you want to publish //generate pom nodes for dependencies diff --git a/privacymoduletor/build.gradle b/privacymoduletor/build.gradle index a739a37..8c985d4 100644 --- a/privacymoduletor/build.gradle +++ b/privacymoduletor/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation 'androidx.core:core-ktx:1.8.0' implementation(libs.androidx_localbroadcast) - implementation "foundation.e:orbotservice:$orbot_version-$orbot_service_patch_version" + implementation "foundation.e:orbotservice:$orbot_version-$orbot_service_revision" } -- GitLab