Skip to content

Commit c8d501e

Browse files
filipslezaklabjakub-tldrj-chmielewskiwojcik91moubctez
authored
UI next for dev (#283)
* APK build job (#158) * Implement "force all traffic" enterprise setting (#159) Related issue: DefGuard/defguard#880 Adds "force all traffic" option to enterprise settings. When selected, all clients are forced to route all traffic via the vpn. * Add DB migrations (#160) * fix periodic SBOM regeneration (#161) * update gitignore * remove private token * update borintun submodule * another test * restore submodule version * Omit IPA from release artefacts; bump dependencies (#168) * iOS: clamp IPv6 prefix to /120 (#170) * Upgrade BoringTun bindings (#172) * Update BoringTun with better bindings.sh * Version reporting (#173) * Fix IpAddrMask (#176) * Added new issue templates (#177) * Use system CA's & fix signing (#181) * Display OpenID provider name (#185) * bump version (#186) * Sync VPNExtension with Client (#187) * add Location::posture_check_required field * update deps, fix ndk version mismatch * allow plain http communication * connect using dummy posture data * move posture structs to enterprise module * gather real posture report * comment * posture-check-only connection flow * WhatsNew for TestFlight * Bump version * add security level patch posture check data (#192) * Update postures.dart * fix posture error display, ran dart format * Update Xcode project * Bump version to 1.7.0 in Xcode project * Add verbosity * Auto sign VPNExtension * One entitlements * pod reintegrate * CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO * One entitlements for Runner * Decrease verbosity * fix dev build fix platform info report to core (#195) * Proxy request error (#196) * human readable errors during oidc flow * formatting * chore: add Renovate config * iOS: fix split DNS (#240) * New iOS build (#244) * KeepAlive fix for iOS (#248) * upgrade major packages, upgrade flutter * Update pubspec.lock * new ui init * bump gradle to 9.0.1 drop explicit kotlin package * migrate project to flutter 3.44 snapshot from template upgrade wireguard_plugin project fix serialization plugin declaration * fix primary and secondary next button styling * bump build workflow * remove testing screen for next button * widgets up * widgets up * new splash screen * Update splash.dart * bumped splash style * redesigned instance screen * add toggle widget * Update next_toggle.dart * add instance screen instances instance * add instance screens * Update .gitignore * Delete .fvmrc * upgrade workflows flutter version * Update pubspec.lock * Delete implementation_plan.artifact.md * fix flutter analyze --------- Co-authored-by: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com> Co-authored-by: Jacek Chmielewski <jchmielewski@teonite.com> Co-authored-by: Maciek <19913370+wojcik91@users.noreply.github.com> Co-authored-by: Jacek Chmielewski <jacek@defguard.net> Co-authored-by: Adam <adam@defguard.net> Co-authored-by: Kamil Chudy <kchudy@teonite.com>
1 parent 9642379 commit c8d501e

239 files changed

Lines changed: 5360 additions & 4963 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.fvmrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/build.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: subosito/flutter-action@v2
3030
with:
3131
channel: stable
32-
flutter-version: 3.38.10
32+
flutter-version: 3.47.0
3333

3434
- name: Use homebrew ruby
3535
run: |
@@ -106,7 +106,7 @@ jobs:
106106
uses: subosito/flutter-action@v2
107107
with:
108108
channel: stable
109-
flutter-version: 3.38.10
109+
flutter-version: 3.47.0
110110

111111
- name: Configure Flutter JDK
112112
run: flutter config --jdk-dir "$JAVA_HOME"
@@ -179,14 +179,11 @@ jobs:
179179
uses: subosito/flutter-action@v2
180180
with:
181181
channel: stable
182-
flutter-version: 3.38.10
183-
184-
- name: Configure Flutter JDK
185-
run: flutter config --jdk-dir "$JAVA_HOME"
182+
flutter-version: 3.47.0
186183

187184
- name: Install Android SDK components
188185
run: |
189-
$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install 'build-tools;29.0.3'
186+
$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install 'build-tools;36.0.0'
190187
- name: Accept licenses
191188
run: yes | flutter doctor --android-licenses
192189

.github/workflows/lint-and-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: subosito/flutter-action@v2
4848
with:
4949
channel: stable
50-
flutter-version: 3.38.10
50+
flutter-version: 3.47.0
5151

5252
- name: get deps
5353
run: flutter pub get
@@ -73,7 +73,7 @@ jobs:
7373
# uses: subosito/flutter-action@v2
7474
# with:
7575
# channel: stable
76-
# flutter-version: 3.38.10
76+
# flutter-version: 3.47.0
7777

7878
# - name: get deps
7979
# run: flutter pub get

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,10 @@
33

44
# FVM Version Cache
55
.fvm/
6+
7+
# JetBrains IDEs
8+
.idea/
9+
*.iml
10+
*.iws
11+
*.ipr
12+
out/

client/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
.swiftpm/
1313
.gradle
1414
migrate_working_dir/
15+
.artifacts
16+
docs
1517

1618
# IntelliJ related
1719
*.iml
@@ -51,3 +53,5 @@ app.*.map.json
5153

5254
local.properties
5355
ios/VPNExtension/BoringTun
56+
# Widget Preview related
57+
.widget_preview/

client/analysis_options.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ linter:
2929
analyzer:
3030
exclude:
3131
- "**/*.g.dart"
32+
- build/**
33+
- android/**
34+
- ios/**
35+
- web/**
36+
- windows/**
37+
- macos/**
38+
- linux/**
3239
plugins:
3340
- custom_lint
3441

client/android/app/build.gradle.kts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
plugins {
22
id("com.android.application")
3-
id("kotlin-android")
43
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
54
id("dev.flutter.flutter-gradle-plugin")
65
}
76

87
android {
98
namespace = "net.defguard.mobile"
10-
compileSdk = 36
9+
compileSdk = 37
1110
ndkVersion = flutter.ndkVersion
1211

1312
compileOptions {
@@ -16,14 +15,10 @@ android {
1615
targetCompatibility = JavaVersion.VERSION_17
1716
}
1817

19-
kotlinOptions {
20-
jvmTarget = JavaVersion.VERSION_17.toString()
21-
}
22-
2318
defaultConfig {
2419
applicationId = "net.defguard.mobile"
2520
minSdk = 31
26-
targetSdk = 36
21+
targetSdk = 37
2722
versionCode = flutter.versionCode
2823
versionName = flutter.versionName
2924
}
@@ -39,6 +34,13 @@ android {
3934
}
4035
}
4136

37+
38+
kotlin {
39+
compilerOptions {
40+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
41+
}
42+
}
43+
4244
dependencies {
4345
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
4446
implementation("com.google.android.gms:play-services-cronet:18.1.1")
Binary file not shown.
-9.53 KB
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)