Skip to content

error build #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mosentest wants to merge 1 commit into
base: master
Choose a base branch
from
Open

error build #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
apply plugin: 'com.android.application'
apply plugin: 'groovyx.grooid.groovy-android'
//apply plugin: 'groovyx.android'

android {
compileSdkVersion 23
buildToolsVersion "21.1.2"
compileSdkVersion 29
buildToolsVersion "29.0.2"

defaultConfig {
applicationId "net.typeblog.socks"
minSdkVersion 21
targetSdkVersion 22
targetSdkVersion 29
versionCode 10
versionName "1.0.1"
}
Expand All @@ -26,6 +27,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'org.codehaus.groovy:groovy:2.4.3:grooid'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'org.codehaus.groovy:groovy:2.4.5:grooid'
// implementation 'org.codehaus.groovy:groovy:2.4.12:grooid'
}
2 changes: 1 addition & 1 deletion app/src/main/build-jni.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ rm -rf ../../libs

ndk-build

for p in armeabi-v7a arm64-v8a x86 mips; do
for p in armeabi-v7a arm64-v8a x86; do
mkdir -p assets/$p
cp libs/$p/{tun2socks,pdnsd} assets/$p/
done
Expand Down
26 changes: 26 additions & 0 deletions app/src/main/java/net/typeblog/socks/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//package net.typeblog.socks;
//
//import android.app.Activity;
//import android.os.Bundle;
//import android.os.PersistableBundle;
//
///**
// * Copyright (C), 2016-2022
// * Author: 超人迪加
// * Date: 2022/3/27 12:07 下午
// */
//public class MainActivity extends Activity {
// @Override
// public void onCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
// super.onCreate(savedInstanceState, persistentState);
// }
//
// @Override public void onCreate(Bundle savedInstanceState) {
// super.onCreate(savedInstanceState);
// setContentView(R.layout.main);
//
// Utility.extractFile(this);
//
// getFragmentManager().beginTransaction().replace(R.id.frame, new ProfileFragment()).commit()
// }
//}
45 changes: 45 additions & 0 deletions app/src/main/java/net/typeblog/socks/util/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
//package net.typeblog.socks.util;
//
//public class Constants
//{
// public static final String DIR = "/data/data/net.typeblog.socks/files";
//
// public static final String ABI_DEFAULT = "armeabi-v7a";
//
// public static final String ROUTE_ALL = "all"
// public static final String ROUTE_CHN = "chn";
//
// public static final String INTENT_PREFIX = "SOCKS",
// INTENT_NAME = INTENT_PREFIX + "NAME",
// INTENT_SERVER = INTENT_PREFIX + "SERV",
// INTENT_PORT = INTENT_PREFIX + "PORT",
// INTENT_USERNAME = INTENT_PREFIX + "UNAME",
// INTENT_PASSWORD = INTENT_PREFIX + "PASSWD",
// INTENT_ROUTE = INTENT_PREFIX + "ROUTE",
// INTENT_DNS = INTENT_PREFIX + "DNS",
// INTENT_DNS_PORT = INTENT_PREFIX + "DNSPORT",
// INTENT_PER_APP = INTENT_PREFIX + "PERAPP",
// INTENT_APP_BYPASS = INTENT_PREFIX + "APPBYPASS",
// INTENT_APP_LIST = INTENT_PREFIX + "APPLIST",
// INTENT_IPV6_PROXY = INTENT_PREFIX + "IPV6",
// INTENT_UDP_GW = INTENT_PREFIX + "UDPGW";
//
// public static final String PREF = "profile",
// PREF_PROFILE = "profile",
// PREF_LAST_PROFILE = "last_profile",
// PREF_SERVER_IP = "server_ip",
// PREF_SERVER_PORT = "server_port",
// PREF_IPV6_PROXY = "ipv6_proxy",
// PREF_UDP_PROXY = "udp_proxy",
// PREF_UDP_GW = "udp_gw",
// PREF_AUTH_USERPW = "auth_userpw",
// PREF_AUTH_USERNAME = "auth_username",
// PREF_AUTH_PASSWORD = "auth_password",
// PREF_ADV_ROUTE = "adv_route",
// PREF_ADV_DNS = "adv_dns",
// PREF_ADV_DNS_PORT = "adv_dns_port",
// PREF_ADV_PER_APP = "adv_per_app",
// PREF_ADV_APP_BYPASS = "adv_app_bypass",
// PREF_ADV_APP_LIST = "adv_app_list",
// PREF_ADV_AUTO_CONNECT = "adv_auto_connect";
//}
168 changes: 168 additions & 0 deletions app/src/main/java/net/typeblog/socks/util/Profile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
//package net.typeblog.socks.util;
//
//import android.content.Context;
//import android.content.SharedPreferences;
//
//public class Profile {
// private Context mContext;
// private SharedPreferences mPref;
// private String mName;
// private String mPrefix;
//
// Profile(Context context, SharedPreferences pref, String name) {
// mContext = context;
// mPref = pref;
// mName = name;
// mPrefix = prefPrefix(name);
// }
//
// String getName() {
// return mName;
// }
//
// String getServer() {
// return mPref.getString(key("server"), "127.0.0.1");
// }
//
// void setServer(String server) {
// mPref.edit().putString(key("server"), server).commit();
// }
//
// int getPort() {
// return mPref.getInt(key("port"), 1080);
// }
//
// void setPort(int port) {
// mPref.edit().putInt(key("port"), port).commit();
// }
//
// boolean getUserPw() {
// return mPref.getBoolean(key("userpw"), false);
// }
//
// void setUserPw(boolean is) {
// mPref.edit().putBoolean(key("userpw"), is).commit();
// }
//
// String getUsername() {
// return mPref.getString(key("username"), "");
// }
//
// void setUsername(String username) {
// mPref.edit().putString(key("username"), username).commit();
// }
//
// String getPassword() {
// return mPref.getString(key("password"), "");
// }
//
// void setPassword(String password) {
// mPref.edit().putString(key("password"), password).commit();
// }
//
// String getRoute() {
// return mPref.getString(key("route"), ROUTE_ALL);
// }
//
// void setRoute(String route) {
// mPref.edit().putString(key("route"), route).commit();
// }
//
// String getDns() {
// return mPref.getString(key("dns"), "8.8.8.8");
// }
//
// void setDns(String dns) {
// mPref.edit().putString(key("dns"), dns).commit();
// }
//
// int getDnsPort() {
// return mPref.getInt(key("dns_port"), 53);
// }
//
// void setDnsPort(int port) {
// mPref.edit().putInt(key("dns_port"), port).commit();
// }
//
// boolean getPerApp() {
// return mPref.getBoolean(key("perapp"), false);
// }
//
// void setPerApp(boolean is) {
// mPref.edit().putBoolean(key("perapp"), is).commit();
// }
//
// boolean getBypassApp() {
// return mPref.getBoolean(key("appbypass"), false);
// }
//
// void setBypassApp(boolean is) {
// mPref.edit().putBoolean(key("appbypass"), is).commit();
// }
//
// String getAppList() {
// return mPref.getString(key("applist"), "");
// }
//
// void setAppList(String list) {
// mPref.edit().putString(key("applist"), list).commit();
// }
//
// boolean getHasIPv6() {
// return mPref.getBoolean(key("ipv6"), false);
// }
//
// void setHasIPv6(boolean has) {
// mPref.edit().putBoolean(key("ipv6"), has).commit();
// }
//
// boolean getHasUDP() {
// return mPref.getBoolean(key("udp"), false);
// }
//
// void setHasUDP(boolean has) {
// mPref.edit().putBoolean(key("udp"), has).commit();
// }
//
// String getUDPGW() {
// return mPref.getString(key("udpgw"), "127.0.0.1:7300");
// }
//
// void setUDPGW(String gw) {
// mPref.edit().putString(key("udpgw"), gw).commit();
// }
//
// boolean getAutoConnect() {
// return mPref.getBoolean(key("auto"), false);
// }
//
// void setAutoConnect(boolean a) {
// mPref.edit().putBoolean(key("auto"), a).commit();
// }
//
// void delete() {
// mPref.edit().remove("server").apply();
// mPref.edit().remove("port").apply();
// mPref.edit().remove("userpw").apply();
// mPref.edit().remove("username").apply();
// mPref.edit().remove("password").apply();
// mPref.edit().remove("route").apply();
// mPref.edit().remove("dns").apply();
// mPref.edit().remove("dns_port").apply();
// mPref.edit().remove("perapp").apply();
// mPref.edit().remove("appbypass").apply();
// mPref.edit().remove("applist").apply();
// mPref.edit().remove("ipv6").apply();
// mPref.edit().remove("udp").apply();
// mPref.edit().remove("udpgw").apply();
// mPref.edit().remove("auto").apply();
// }
//
// private String key(String k) {
// return mPrefix + k;
// }
//
// private static String prefPrefix(String name) {
// return name.replace("_", "__").replace(" ", "_");
// }
//}
4 changes: 2 additions & 2 deletions app/src/main/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_ABI := armeabi-v7a arm64-v8a mips x86
APP_ABI := armeabi-v7a arm64-v8a x86
APP_PLATFORM := android-21
APP_STL := stlport_static
APP_STL := c++_static
NDK_TOOLCHAIN_VERSION := 4.9
19 changes: 16 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,30 @@

buildscript {
repositories {
jcenter()
maven { url 'https://maven.aliyun.com/repository/public' }
maven { url 'https://maven.aliyun.com/repository/google' }
maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url 'https://maven.aliyun.com/repository/central' }
maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:3.0.0'
//https://github.com/groovy/groovy-android-gradle-plugin
classpath 'org.codehaus.groovy:gradle-groovy-android-plugin:0.3.6'
// classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.1'
}
}

allprojects {
repositories {
jcenter()
maven { url 'https://maven.aliyun.com/repository/public' }
maven { url 'https://maven.aliyun.com/repository/google' }
maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url 'https://maven.aliyun.com/repository/central' }
maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
}
}
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
android.overridePathCheck=true