Skip to content

Commit 972ce58

Browse files
committed
Use gitsubmodule instead of flutter dependencies
1 parent 1511f80 commit 972ce58

File tree

7 files changed

+8
-28
lines changed

7 files changed

+8
-28
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "engine"]
2+
path = engine
3+
url = https://github.com/VPNclient/VPNclient-engine

android/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ allprojects {
1919
repositories {
2020
google()
2121
mavenCentral()
22-
//maven { url 'https://jitpack.io' }
2322
}
2423
}
2524

@@ -52,8 +51,6 @@ android {
5251
dependencies {
5352
testImplementation("org.jetbrains.kotlin:kotlin-test")
5453
testImplementation("org.mockito:mockito-core:5.0.0")
55-
//implementation project(':vpnclient-engine-android')
56-
//implementation 'com.github.VPNclient:VPNclient-engine:android-v0.1.1'
5754
}
5855

5956
testOptions {

android/settings.gradle

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
rootProject.name = 'vpnclient_engine_flutter'
22

3-
//include ':vpnclient_engine_android'
4-
//project(':vpnclient_engine_android').projectDir = new File('../../VPNclient_engine_android')
3+
include ':vpnclient_engine_android'
4+
project(':vpnclient_engine_android').projectDir = new File('../engine/android')
55

6-
//def targetPath = new File(settingsDir, '../../VPNclient-engine/android')
7-
//println "[DEBUG55] Expected project dir: ${targetPath.absolutePath}"
8-
9-
10-
//include ':vpnclient-engine-android'
11-
//project(':vpnclient-engine-android').projectDir = new File('../../../VPNclient-engine/android')
12-
//project(':vpnclient-engine-android').projectDir = new File('/Users/anton/proj/VPNclient/VPNclient-engine/android')

engine

Submodule engine added at d0e5480

example/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,4 +341,4 @@ packages:
341341
version: "3.0.4"
342342
sdks:
343343
dart: ">=3.7.2 <4.0.0"
344-
flutter: ">=3.18.0-18.0.pre.54"
344+
flutter: ">=3.29.3"

pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,4 +279,4 @@ packages:
279279
version: "1.1.1"
280280
sdks:
281281
dart: ">=3.7.2 <4.0.0"
282-
flutter: ">=3.18.0-18.0.pre.54"
282+
flutter: ">=3.29.3"

pubspec.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,6 @@ dependencies:
1919
http: ^1.3.0
2020
flutter_v2ray: ^1.0.10
2121
rxdart: ^0.28.0
22-
#vpnclient_engine_android:
23-
#git:
24-
#url: https://github.com/VPNclient/VPNclient-engine.git
25-
#ref: main
26-
#path: android/
27-
vpnclient_engine_ios:
28-
path: ../VPNclient-engine-ios
29-
vpnclient_engine_macos:
30-
path: ../VPNclient-engine-ios
31-
#vpnclient_engine_windows:
32-
#git:
33-
#url: https://github.com/VPNclient/VPNclient-engine.git
34-
#ref: main
35-
#path: windows/
3622

3723
dev_dependencies:
3824
flutter_test:

0 commit comments

Comments
 (0)