Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,12 @@ afterEvaluate {
}

android {
compileSdk = 36
compileSdk = 37

defaultConfig {
applicationId "net.kollnig.missioncontrol"
minSdk 23
targetSdk 36
targetSdk 37
//noinspection HighAppVersionCode
versionCode 2026042701
versionName "2026.04.27"
Expand Down Expand Up @@ -300,7 +300,7 @@ androidComponents {
}

dependencies {
implementation 'androidx.core:core-ktx:1.18.0'
implementation 'androidx.core:core-ktx:1.19.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.16.1'

Expand All @@ -315,18 +315,18 @@ dependencies {
implementation 'androidx.preference:preference:1.2.1'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
implementation 'com.google.android.material:material:1.13.0'
implementation 'com.google.android.material:material:1.14.0'
implementation 'androidx.work:work-runtime:2.11.2'
implementation 'com.google.guava:guava:33.6.0-android'
annotationProcessor 'androidx.annotation:annotation:1.10.0'

// fix errors with libraries
def lifecycle_version = '2.10.0'
def lifecycle_version = '2.11.0'
//implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

// https://bumptech.github.io/glide/
def glide_version = "5.0.7"
def glide_version = "5.0.9"
implementation("com.github.bumptech.glide:glide:$glide_version") {
exclude group: "com.android.support"
}
Expand All @@ -349,7 +349,7 @@ dependencies {
implementation 'com.caverock:androidsvg-aar:1.4'

// OkHttp for DNS-over-HTTPS
implementation 'com.squareup.okhttp3:okhttp:5.3.2'
implementation 'com.squareup.okhttp3:okhttp:5.4.0'
}

// Fix lint error on release builds
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
dependencies {
// https://developer.android.com/studio
classpath 'com.android.tools.build:gradle:9.0.1'
classpath 'com.android.tools.build:gradle:9.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Dec 15 12:41:56 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions wgbridge-rs/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions wgbridge-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ tokio = { version = "1.43", features = ["rt-multi-thread", "net", "sync", "time"
base64 = "0.22"
hex = "0.4"
ipnetwork = "0.21"
getrandom = "0.2"
getrandom = "0.3"
libc = "0.2"
log = "0.4"

[target.'cfg(target_os = "android")'.dependencies]
jni = "0.21"
android_logger = "0.14"
android_logger = "0.15"

[profile.release]
lto = true
Expand Down
2 changes: 1 addition & 1 deletion wgbridge-rs/src/keys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use gotatun::x25519::{PublicKey, StaticSecret};
/// Returns a fresh base64 WireGuard private key.
pub fn generate_private_key() -> Result<String, String> {
let mut bytes = [0u8; 32];
getrandom::getrandom(&mut bytes).map_err(|e| format!("getrandom: {e}"))?;
getrandom::fill(&mut bytes).map_err(|e| format!("getrandom: {e}"))?;
// StaticSecret::from clamps the scalar per X25519.
let secret = StaticSecret::from(bytes);
Ok(BASE64.encode(secret.to_bytes()))
Expand Down