Pull request 41: 🛠 Chore: Add the possibility to add other projects locally

Squashed commit of the following:

commit 396d4c75429493d2878eb3e6cc38f4bdd0fc1976
Author: Artem Ivanov <a.ivanov@adguard.com>
Date:   Thu Dec 4 15:08:30 2025 +0800

    🐛 Bug: Correct the path to bamboo-kit

commit 6b73740db589ea6eda0b3194f754f0ef4bf63f3d
Author: Artem Ivanov <a.ivanov@adguard.com>
Date:   Wed Dec 3 18:41:50 2025 +0800

    💡 Enhance: Remove some files from git index

commit 4bfbc3ca7a21c3706789905453b6df549526d661
Author: Artem Ivanov <a.ivanov@adguard.com>
Date:   Wed Dec 3 18:15:27 2025 +0800

    💡 Enhance: Inject variables to Bamboo service

commit d37f972521a708173cc3be795e9081855261c7f3
Author: Artem Ivanov <a.ivanov@adguard.com>
Date:   Wed Dec 3 18:03:11 2025 +0800

    🐛 Bug: Fix a typo related to keystore path

commit fe0cd90a5bc1a09af22f0b99bf8f261163ef187d
Author: Artem Ivanov <a.ivanov@adguard.com>
Date:   Wed Dec 3 17:54:21 2025 +0800

    🐛 Bug: Fix some bugs related to bamboo spec for Android part

commit 3ffa6237e61cf4a5a752eb55d9c06e38c3d6b88d
Merge: 4f07dc9 d9fcbf3
Author: Artem Ivanov <a.ivanov@adguard.com>
Date:   Wed Dec 3 16:50:42 2025 +0800

    Merge branch 'master' into feature/TRUST-50-1
    
    # Conflicts:
    #	plugins/vpn_plugin/android/build.gradle

commit 4f07dc98ff8f30086a1b97f0f34cff4e7d6efdf7
Author: Artem Ivanov <a.ivanov@adguard.com>
Date:   Wed Dec 3 16:43:45 2025 +0800

    🛠 Chore: Add the possibility to add other projects locally

.gitignore

@@ -36,7 +36,6 @@ devtools_options.yaml
 .pub-cache/
 .pub/
 /build/
-/ios/build/
 
 # Symbolication related
 app.*.symbols
@@ -48,6 +47,7 @@ app.*.map.json
 .gradle/
 android/app/.cxx
 android/trusttunnel.keystore
+android/build
 
 # Android Studio will place build artifacts here
 /android/app/debug
@@ -69,7 +69,8 @@ lib/common/localization/generated/
 .fvmrc
 !lib/data/api/swagger/*.g.dart
 
-# Fastlane and Ruby related
+# iOS related
+/ios/build/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots

android/.gitignore

@@ -4,6 +4,7 @@ gradle-wrapper.jar
 /gradlew
 /gradlew.bat
 /local.properties
+/libs.gradle
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.

android/build/.last_build_id

@@ -1 +0,0 @@
-e35a63c2d6a81fad415b4f50726ce6cf

android/settings.gradle

@@ -18,8 +18,10 @@ pluginManagement {
 
 plugins {
   id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-  id "com.android.application" version "8.11.1" apply false
+  id "com.android.application" version "8.9.1" apply false
   id "org.jetbrains.kotlin.android" version "2.2.10" apply false 
 }
 
 include ":app"
+
+try { apply from: 'libs.gradle' } catch (Exception ignored) { }

android/template.libs.gradle

@@ -0,0 +1,6 @@
+// TrustTunnel Core project configuration
+includeBuild('/path-to-own/vpn-libs/platform/android') {
+    dependencySubstitution {
+        substitute module('com.adguard.trusttunnel:trusttunnel-client-android') using project(':lib')
+    }
+}

bamboo-specs/plan-building-to-deploy.yaml

@@ -62,7 +62,7 @@ Preparing:
         repository: bamboo-scripts
         path: bamboo-scripts
         force-clean-build: true
-    - script: python3 trusttunnel/bamboo-scripts/bamboo-kit.py addLabelToPlan --project-key TT --plan-key BUILDINGTODEPLOY --build-number "${bamboo.buildNumber}" --label "${bamboo_build_channel}"
+    - script: python3 bamboo-scripts/bamboo-kit.py addLabelToPlan --project-key TT --plan-key BUILDINGTODEPLOY --build-number "${bamboo.buildNumber}" --label "${bamboo_build_channel}"
     - script: trusttunnel/bamboo-specs/scripts/collect_changelog_retag_collect_variables.sh "${bamboo_working_directory}/git-scripts/git_kit.sh"
     - inject-variables:
         file: trusttunnel/variables.txt

bamboo-specs/scripts/configure_before_android_build.sh

@@ -16,11 +16,11 @@ make .dart_tool/package_config.json
 
 # Export Bamboo variables
 export GPR_KEY="${bamboo_githubPublicRepoPassword}"
-echo "gpr.key=${bamboo_githubPublicRepoPassword}" | base64 --decode >> "${android_root_dir}/gradle.properties"
+echo "gpr.key=${bamboo_githubPublicRepoPassword}" >> "${android_root_dir}/gradle.properties"
 
-echo "${bamboo_adguardVpnKeyStoreSecret}" | base64 --decode > "${android_root_dir}/trusttunnel.keystore"
+echo "${bamboo_keyStoreSecret}" | base64 --decode > "${android_root_dir}/trusttunnel.keystore"
 
-echo "signingConfigKeyAlias=${bamboo_adguardVpnKeyAliasSecret}" >> "${android_root_dir}/gradle.properties"
-echo "signingConfigKeyPassword=${bamboo_adguardVpnKeyPassword}" >> "${android_root_dir}/gradle.properties"
-echo "signingConfigKeyStorePath=${root_dir_to_put_keystore}/vpn.keystore" >> "${android_root_dir}/gradle.properties"
-echo "signingConfigKeyStorePassword=${bamboo_adguardVpnStorePassword}" >> "${android_root_dir}/gradle.properties"
+echo "signingConfigKeyAlias=${bamboo_keyAliasSecret}" >> "${android_root_dir}/gradle.properties"
+echo "signingConfigKeyPassword=${bamboo_keyPassword}" >> "${android_root_dir}/gradle.properties"
+echo "signingConfigKeyStorePath=${android_root_dir}/trusttunnel.keystore" >> "${android_root_dir}/gradle.properties"
+echo "signingConfigKeyStorePassword=${bamboo_storePassword}" >> "${android_root_dir}/gradle.properties"

plugins/vpn_plugin/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.11.1")
+        classpath("com.android.tools.build:gradle:8.9.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
@@ -57,4 +57,4 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("org.mockito:mockito-core:5.0.0")
     implementation("com.adguard.trusttunnel:trusttunnel-client-android:0.99.46")
-}
+}