Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b6e5692 authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Merge branch '3514-upgrade_orbotservice' into 'main'

feat:3514: Update orbotservice to 17.5.0-RC2

See merge request !209
parents 3a3a0564 6942b6bc
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ dependencies {
        libs.eos.telemetry,

        libs.google.material,
        libs.kotlinx.serialization,
        libs.kotlinx.serialization.json,

        libs.maplibre,
        libs.mpandroidcharts,
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ dependencies {
        libs.androidx.datastore.preferences,
        libs.bundles.koin,
        libs.kotlinx.coroutines,
        libs.kotlinx.serialization,
        libs.kotlinx.serialization.json,
        libs.timber
    )
}
+58 −27
Original line number Diff line number Diff line
[versions]

agp = "8.8.0"
andoridx-appcompat = "1.7.0"
android-work = "2.10.1"
androidx-core = "1.16.0"
androidx-datastore-preferences = "1.1.7"
androidx-fragment-ktx = "1.8.6"
androidx-lifecycle = "2.8.7"
androidx-localbroadcast = "1.1.0"
androidx-navigation = "2.8.7"
androidx-viewpager2 = "1.1.0"
benmanes-versions = "0.38.0"
detekt = "1.23.1"
eos-elib = "0.0.1-alpha11"
eos-telemetry = "1.0.1-release"
google-material = "1.12.0"
guardian-jtorctl = "0.4.5.7"
guardian-tor-android = "0.4.8.17"
jaredrummler-android-shell = "1.0.0"
junit = "4.13.2"
koin = "3.5.6"
kotlinx-coroutines = "1.8.1"
kotlin = "2.1.10"
androidx-navigation = "2.8.7"
androidx-lifecycle = "2.8.7"
orbotservice = "orbot-17.2.1-2"
kotlin-serialization = "2.1.10"
kotlinx-coroutines = "1.8.1"
kotlinx-serialization-json = "1.8.1"
leakcanary = "2.10"
maplibre = "11.8.2"
mpandroidcharts = "v3.1.0"
orbotservice = "orbot-17.5.0-1"
pcap = "1.8.2"
retrofit = "2.11.0"
pcap4j = "1.8.2"
spotless = "6.23.3"
timber = "5.0.1"

[libraries]

androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version = "1.15.0" }
androidx-datastore-preferences = { group = "androidx.datastore", name="datastore-preferences", version = "1.1.7" }
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version = "1.8.6" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "andoridx-appcompat" }
androidx-core = { group = "androidx.core", name = "core", version.ref = "androidx-core" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core" }
androidx-datastore-preferences = { group = "androidx.datastore", name="datastore-preferences", version.ref = "androidx-datastore-preferences" }
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment-ktx" }
androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
androidx-localbroadcast = { group = "androidx.localbroadcastmanager", name = "localbroadcastmanager", version  = "1.1.0" }
androidx-localbroadcast = { group = "androidx.localbroadcastmanager", name = "localbroadcastmanager", version.ref  = "androidx-localbroadcast" }
androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "androidx-navigation" }
androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "androidx-navigation" }
androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version = "1.1.0" }
androidx-work-ktx = { group = "androidx.work", name = "work-runtime-ktx", version = "2.10.0" }
eos-elib = { group = "foundation.e", name = "elib", version = "0.0.1-alpha11" }
androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "androidx-viewpager2" }
androidx-work = { group = "androidx.work", name = "work-runtime", version.ref = "android-work" }
androidx-work-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "android-work" }
eos-elib = { group = "foundation.e", name = "elib", version.ref = "eos-elib" }
eos-orbotservice = { group = "foundation.e", name = "orbotservice", version.ref = "orbotservice" }
eos-telemetry = { group = "foundation.e.lib", name = "telemetry", version = "1.0.1-release" }
google-material = { group = "com.google.android.material", name = "material", version = "1.12.0" }
junit = { group = "junit", name = "junit", version = "4.13.2" }
eos-telemetry = { group = "foundation.e.lib", name = "telemetry", version.ref = "eos-telemetry" }
google-material = { group = "com.google.android.material", name = "material", version.ref = "google-material" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.8.0" }
leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version = "2.10" }
maplibre = { group = "org.maplibre.gl", name = "android-sdk", version = "11.8.2" }
mpandroidcharts = { group = "com.github.PhilJay", name = "MPAndroidChart", version = "v3.1.0" }
pcap4j = { group = "org.pcap4j", name = "pcap4j-core", version.ref = "pcap4j" }
pcap4j-packetfactory-static = { group = "org.pcap4j", name = "pcap4j-packetfactory-static", version.ref = "pcap4j" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leakcanary" }
maplibre = { group = "org.maplibre.gl", name = "android-sdk", version.ref = "maplibre" }
mpandroidcharts = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidcharts" }
pcap-core = { group = "org.pcap4j", name = "pcap4j-core", version.ref = "pcap" }
pcap-factory = { group = "org.pcap4j", name = "pcap4j-packetfactory-static", version.ref = "pcap" }
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
retrofit-scalars = { group = "com.squareup.retrofit2", name = "converter-scalars", version.ref = "retrofit" }
timber = { group = "com.jakewharton.timber", name = "timber",  version = "5.0.1" }
timber = { group = "com.jakewharton.timber", name = "timber",  version.ref = "timber" }

# Orbotservice dependencies
android-shell = { group = "com.jaredrummler", name = "android-shell", version.ref = "jaredrummler-android-shell" }
guardian-geoip = { group = "foundation.e", name = "geoip", version.ref = "orbotservice" }
guardian-jtorctl = { group = "info.guardianproject", name = "jtorctl", version.ref = "guardian-jtorctl" }
guardian-orbotlib = { group = "foundation.e", name = "orbotlib", version.ref = "orbotservice" }
guardian-tor-android = { group = "info.guardianproject", name = "tor-android", version.ref = "guardian-tor-android" }

[bundles]

koin = ["koin-core", "koin-android"]
kotlin-android-coroutines = ["androidx-core-ktx", "kotlinx-coroutines"]
pcap4j = ["pcap4j", "pcap4j-packetfactory-static"]

[plugins]

android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
androidx-navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidx-navigation" }
benmanes-versions = { id = "com.github.ben-manes.versions", version = "0.38.0" }
benmanes-versions = { id = "com.github.ben-manes.versions", version.ref = "benmanes-versions" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref =  "kotlin" }
spotless = { id = "com.diffplug.spotless", version = "6.23.3" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version  = "2.1.10" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref  = "kotlin-serialization" }
+1 −1
Original line number Diff line number Diff line
# Ipscrambling module

This Module implements IpScramblerModule functionnalities with Tor, reliying on a fork of OrbotService.
This Module implements IpScramblerModule functionalities with Tor, relying on a fork of OrbotService.

# Build

+2 −1
Original line number Diff line number Diff line
@@ -51,9 +51,10 @@ dependencies {
        libs.bundles.koin,
        libs.bundles.kotlin.android.coroutines,
        libs.androidx.localbroadcast,
        libs.pcap4j,
        libs.pcap.core,
        libs.timber
    )

    implementation libs.eos.orbotservice
    implementation project(':core')
}
Loading