Skip to content

Commit 8ebe4fd

Browse files
pkongkhapkongkha
committed
Change package id, disable signing for apple
Change package id from click.vpnclient to vpnclient.click Remove signing config from macOS/iOS xcodeproj
1 parent d35f85f commit 8ebe4fd

9 files changed

Lines changed: 43 additions & 31 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ There are two ways to get VPNclient App:
4848

4949
### Install a Pre-built Release (End Users)
5050
VPNclient App is in active development and available in beta form:
51-
- **Android:** Download via Google Play [VPNclient on Google Play](https://play.google.com/store/apps/details?id=click.vpnclient.vpnclient) (or join the testing program). Requires Android 6.0 or higher.
51+
- **Android:** Download via Google Play [VPNclient on Google Play](https://play.google.com/store/apps/details?id=click.vpnclient) (or join the testing program). Requires Android 6.0 or higher.
5252
- **iOS:** Download via App Store – [VPNclient on App Store](https://testflight.apple.com/join/KQr4SeS7). Requires iOS 15.6 or higher.
5353

5454
After installing, simply launch the app. On first launch, you may be prompted to accept VPN permissions (Android) or install a VPN profile (iOS) – these are required to create the VPN tunnel.

‎android/app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (keystorePropertiesFile.exists()) {
1616
}
1717

1818
android {
19-
namespace = "click.vpnclient.vpnclient"
19+
namespace = "click.vpnclient"
2020
compileSdk = flutter.compileSdkVersion
2121

2222
compileOptions {
@@ -29,7 +29,7 @@ android {
2929
}
3030

3131
defaultConfig {
32-
applicationId = "click.vpnclient.vpnclient"
32+
applicationId = "click.vpnclient"
3333
minSdk = flutter.minSdkVersion
3434
targetSdk = flutter.targetSdkVersion
3535
versionCode = flutter.versionCode

android/app/src/main/kotlin/vpnclient/click/MainActivity.kt renamed to android/app/src/main/kotlin/click/vpnclient/MainActivity.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
package vpnclient.click
1+
package click.vpnclient
22

3-
//
43
import android.content.Intent
54
import android.net.VpnService
65
import android.os.Bundle
76
import io.flutter.plugin.common.MethodChannel
8-
//
97

108
import io.flutter.embedding.android.FlutterActivity
119

android/app/src/main/kotlin/vpnclient/click/VPNService.kt renamed to android/app/src/main/kotlin/click/vpnclient/VPNService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vpnclient.click
1+
package click.vpnclient
22

33
import android.net.VpnService
44
import android.os.ParcelFileDescriptor

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,14 @@
354354
inputFileListPaths = (
355355
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
356356
);
357+
inputPaths = (
358+
);
357359
name = "[CP] Embed Pods Frameworks";
358360
outputFileListPaths = (
359361
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
360362
);
363+
outputPaths = (
364+
);
361365
runOnlyForDeploymentPostprocessing = 0;
362366
shellPath = /bin/sh;
363367
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -472,17 +476,19 @@
472476
buildSettings = {
473477
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
474478
CLANG_ENABLE_MODULES = YES;
479+
CODE_SIGN_STYLE = Manual;
475480
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
476-
DEVELOPMENT_TEAM = 6XT4R7V83F;
481+
DEVELOPMENT_TEAM = "";
477482
ENABLE_BITCODE = NO;
478483
INFOPLIST_FILE = Runner/Info.plist;
479484
LD_RUNPATH_SEARCH_PATHS = (
480485
"$(inherited)",
481486
"@executable_path/Frameworks",
482487
);
483488
MARKETING_VERSION = 1.0.5;
484-
PRODUCT_BUNDLE_IDENTIFIER = vpnclient.click;
489+
PRODUCT_BUNDLE_IDENTIFIER = click.vpnclient;
485490
PRODUCT_NAME = "$(TARGET_NAME)";
491+
PROVISIONING_PROFILE_SPECIFIER = "";
486492
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
487493
SWIFT_VERSION = 5.0;
488494
VERSIONING_SYSTEM = "apple-generic";
@@ -658,17 +664,19 @@
658664
buildSettings = {
659665
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
660666
CLANG_ENABLE_MODULES = YES;
667+
CODE_SIGN_STYLE = Manual;
661668
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
662-
DEVELOPMENT_TEAM = 6XT4R7V83F;
669+
DEVELOPMENT_TEAM = "";
663670
ENABLE_BITCODE = NO;
664671
INFOPLIST_FILE = Runner/Info.plist;
665672
LD_RUNPATH_SEARCH_PATHS = (
666673
"$(inherited)",
667674
"@executable_path/Frameworks",
668675
);
669676
MARKETING_VERSION = 1.0.5;
670-
PRODUCT_BUNDLE_IDENTIFIER = vpnclient.click;
677+
PRODUCT_BUNDLE_IDENTIFIER = click.vpnclient;
671678
PRODUCT_NAME = "$(TARGET_NAME)";
679+
PROVISIONING_PROFILE_SPECIFIER = "";
672680
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
673681
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
674682
SWIFT_VERSION = 5.0;
@@ -684,17 +692,17 @@
684692
CLANG_ENABLE_MODULES = YES;
685693
CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
686694
CODE_SIGN_IDENTITY = "Apple Development";
687-
CODE_SIGN_STYLE = Automatic;
695+
CODE_SIGN_STYLE = Manual;
688696
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
689-
DEVELOPMENT_TEAM = 6XT4R7V83F;
697+
DEVELOPMENT_TEAM = "";
690698
ENABLE_BITCODE = NO;
691699
INFOPLIST_FILE = Runner/Info.plist;
692700
LD_RUNPATH_SEARCH_PATHS = (
693701
"$(inherited)",
694702
"@executable_path/Frameworks",
695703
);
696704
MARKETING_VERSION = 1.0.5;
697-
PRODUCT_BUNDLE_IDENTIFIER = vpnclient.click;
705+
PRODUCT_BUNDLE_IDENTIFIER = click.vpnclient;
698706
PRODUCT_NAME = "$(TARGET_NAME)";
699707
PROVISIONING_PROFILE_SPECIFIER = "";
700708
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

‎ios/Runner/Info.plist‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<string>$(FLUTTER_BUILD_NUMBER)</string>
2727
<key>LSRequiresIPhoneOS</key>
2828
<true/>
29+
<key>NSAppTransportSecurity</key>
30+
<dict>
31+
<key>NSAllowsArbitraryLoads</key>
32+
<true/>
33+
</dict>
2934
<key>UIApplicationSupportsIndirectInputEvents</key>
3035
<true/>
3136
<key>UILaunchStoryboardName</key>
@@ -45,10 +50,5 @@
4550
<string>UIInterfaceOrientationLandscapeLeft</string>
4651
<string>UIInterfaceOrientationLandscapeRight</string>
4752
</array>
48-
<key>NSAppTransportSecurity</key>
49-
<dict>
50-
<key>NSAllowsArbitraryLoads</key>
51-
<true/>
52-
</dict>
5353
</dict>
5454
</plist>

‎linux/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
77
set(BINARY_NAME "vpn_client")
88
# The unique GTK application identifier for this application. See:
99
# https://wiki.gnome.org/HowDoI/ChooseApplicationID
10-
set(APPLICATION_ID "vpnclient.click")
10+
set(APPLICATION_ID "click.vpnclient")
1111

1212
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
1313
# versions of CMake.

‎macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -389,10 +389,14 @@
389389
inputFileListPaths = (
390390
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
391391
);
392+
inputPaths = (
393+
);
392394
name = "[CP] Embed Pods Frameworks";
393395
outputFileListPaths = (
394396
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
395397
);
398+
outputPaths = (
399+
);
396400
runOnlyForDeploymentPostprocessing = 0;
397401
shellPath = /bin/sh;
398402
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -574,10 +578,10 @@
574578
CLANG_ENABLE_MODULES = YES;
575579
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
576580
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
577-
CODE_SIGN_STYLE = Automatic;
581+
CODE_SIGN_STYLE = Manual;
578582
COMBINE_HIDPI_IMAGES = YES;
579583
CURRENT_PROJECT_VERSION = 4;
580-
DEVELOPMENT_TEAM = 6XT4R7V83F;
584+
DEVELOPMENT_TEAM = "";
581585
INFOPLIST_FILE = Runner/Info.plist;
582586
INFOPLIST_KEY_CFBundleDisplayName = "VPN Client";
583587
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
@@ -587,7 +591,7 @@
587591
);
588592
MACOSX_DEPLOYMENT_TARGET = 11.0;
589593
MARKETING_VERSION = 1.0.4;
590-
PRODUCT_BUNDLE_IDENTIFIER = vpnclient.click;
594+
PRODUCT_BUNDLE_IDENTIFIER = click.vpnclient;
591595
PRODUCT_NAME = "VPN Client";
592596
PROVISIONING_PROFILE_SPECIFIER = "";
593597
SWIFT_VERSION = 5.0;
@@ -715,11 +719,12 @@
715719
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
716720
CLANG_ENABLE_MODULES = YES;
717721
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
722+
CODE_SIGN_IDENTITY = "Apple Development";
718723
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
719-
CODE_SIGN_STYLE = Automatic;
724+
CODE_SIGN_STYLE = Manual;
720725
COMBINE_HIDPI_IMAGES = YES;
721726
CURRENT_PROJECT_VERSION = 4;
722-
DEVELOPMENT_TEAM = 6XT4R7V83F;
727+
DEVELOPMENT_TEAM = "";
723728
INFOPLIST_FILE = Runner/Info.plist;
724729
INFOPLIST_KEY_CFBundleDisplayName = "VPN Client";
725730
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
@@ -729,7 +734,7 @@
729734
);
730735
MACOSX_DEPLOYMENT_TARGET = 11.0;
731736
MARKETING_VERSION = 1.0.4;
732-
PRODUCT_BUNDLE_IDENTIFIER = vpnclient.click;
737+
PRODUCT_BUNDLE_IDENTIFIER = click.vpnclient;
733738
PRODUCT_NAME = "VPN Client";
734739
PROVISIONING_PROFILE_SPECIFIER = "";
735740
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -745,10 +750,11 @@
745750
CLANG_ENABLE_MODULES = YES;
746751
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
747752
CODE_SIGN_IDENTITY = "Apple Development";
748-
CODE_SIGN_STYLE = Automatic;
753+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
754+
CODE_SIGN_STYLE = Manual;
749755
COMBINE_HIDPI_IMAGES = YES;
750756
CURRENT_PROJECT_VERSION = 4;
751-
DEVELOPMENT_TEAM = 6XT4R7V83F;
757+
DEVELOPMENT_TEAM = "";
752758
INFOPLIST_FILE = Runner/Info.plist;
753759
INFOPLIST_KEY_CFBundleDisplayName = "VPN Client";
754760
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
@@ -758,7 +764,7 @@
758764
);
759765
MACOSX_DEPLOYMENT_TARGET = 11.0;
760766
MARKETING_VERSION = 1.0.4;
761-
PRODUCT_BUNDLE_IDENTIFIER = vpnclient.click;
767+
PRODUCT_BUNDLE_IDENTIFIER = click.vpnclient;
762768
PRODUCT_NAME = "VPN Client";
763769
PROVISIONING_PROFILE_SPECIFIER = "";
764770
SWIFT_VERSION = 5.0;

‎macos/Runner/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<string>$(FLUTTER_BUILD_NAME)</string>
2121
<key>CFBundleVersion</key>
2222
<string>$(FLUTTER_BUILD_NUMBER)</string>
23+
<key>LSApplicationCategoryType</key>
24+
<string>public.app-category.utilities</string>
2325
<key>LSMinimumSystemVersion</key>
2426
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2527
<key>NSHumanReadableCopyright</key>
@@ -28,7 +30,5 @@
2830
<string>MainMenu</string>
2931
<key>NSPrincipalClass</key>
3032
<string>NSApplication</string>
31-
<key>LSApplicationCategoryType</key>
32-
<string>public.app-category.utilities</string>
3333
</dict>
3434
</plist>

0 commit comments

Comments
 (0)