Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
1983dec1
Commit
1983dec1
authored
May 06, 2021
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update dependencies
parent
181ef532
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
17 additions
and
17 deletions
+17
-17
build.gradle.kts
build.gradle.kts
+1
-1
buildSrc/src/main/kotlin/Helpers.kt
buildSrc/src/main/kotlin/Helpers.kt
+1
-1
core/build.gradle.kts
core/build.gradle.kts
+3
-3
core/src/main/java/com/github/shadowsocks/database/Profile.kt
.../src/main/java/com/github/shadowsocks/database/Profile.kt
+1
-1
core/src/main/java/com/github/shadowsocks/net/LocalSocketListener.kt
...in/java/com/github/shadowsocks/net/LocalSocketListener.kt
+3
-2
gradle.properties
gradle.properties
+1
-0
mobile/build.gradle.kts
mobile/build.gradle.kts
+2
-2
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
.../src/main/java/com/github/shadowsocks/ProfilesFragment.kt
+1
-3
plugin/CHANGES.md
plugin/CHANGES.md
+1
-1
plugin/build.gradle.kts
plugin/build.gradle.kts
+1
-1
repositories.gradle.kts
repositories.gradle.kts
+2
-2
No files found.
build.gradle.kts
View file @
1983dec1
...
...
@@ -22,7 +22,7 @@ buildscript {
classpath
(
"com.google.gms:google-services:4.3.5"
)
classpath
(
"com.vanniktech:gradle-maven-publish-plugin:0.14.2"
)
classpath
(
"gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3"
)
classpath
(
"org.jetbrains.dokka:dokka-gradle-plugin:1.4.3
0
"
)
classpath
(
"org.jetbrains.dokka:dokka-gradle-plugin:1.4.3
2
"
)
}
}
...
...
buildSrc/src/main/kotlin/Helpers.kt
View file @
1983dec1
...
...
@@ -11,7 +11,7 @@ import org.gradle.kotlin.dsl.getByName
import
org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import
java.util.*
const
val
lifecycleVersion
=
"2.3.
0-rc0
1"
const
val
lifecycleVersion
=
"2.3.1"
private
val
Project
.
android
get
()
=
extensions
.
getByName
<
BaseExtension
>(
"android"
)
...
...
core/build.gradle.kts
View file @
1983dec1
...
...
@@ -64,12 +64,12 @@ tasks.register<Exec>("cargoClean") {
tasks
.
clean
.
dependsOn
(
"cargoClean"
)
dependencies
{
val
coroutinesVersion
=
"1.
4.2
"
val
roomVersion
=
"2.3.0
-rc01
"
val
coroutinesVersion
=
"1.
5.0-RC
"
val
roomVersion
=
"2.3.0"
val
workVersion
=
"2.5.0"
api
(
project
(
":plugin"
))
api
(
"androidx.core:core-ktx:1.5.0-rc0
1
"
)
api
(
"androidx.core:core-ktx:1.5.0-rc0
2
"
)
api
(
"androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
)
api
(
"androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion"
)
...
...
core/src/main/java/com/github/shadowsocks/database/Profile.kt
View file @
1983dec1
...
...
@@ -114,7 +114,7 @@ data class Profile(
if
(
match
!=
null
)
{
val
profile
=
Profile
()
feature
?.
copyFeatureSettingsTo
(
profile
)
profile
.
method
=
match
.
groupValues
[
1
].
toLowerC
ase
(
Locale
.
ENGLISH
)
profile
.
method
=
match
.
groupValues
[
1
].
lowerc
ase
(
Locale
.
ENGLISH
)
profile
.
password
=
match
.
groupValues
[
2
]
profile
.
host
=
match
.
groupValues
[
3
]
profile
.
remotePort
=
match
.
groupValues
[
4
].
toInt
()
...
...
core/src/main/java/com/github/shadowsocks/net/LocalSocketListener.kt
View file @
1983dec1
...
...
@@ -29,7 +29,8 @@ import android.system.Os
import
android.system.OsConstants
import
kotlinx.coroutines.CoroutineScope
import
kotlinx.coroutines.channels.Channel
import
kotlinx.coroutines.channels.sendBlocking
import
kotlinx.coroutines.channels.onFailure
import
kotlinx.coroutines.channels.trySendBlocking
import
kotlinx.coroutines.launch
import
timber.log.Timber
import
java.io.File
...
...
@@ -61,7 +62,7 @@ abstract class LocalSocketListener(name: String, socketFile: File) : Thread(name
}
}
}
closeChannel
.
sendBlocking
(
Unit
)
closeChannel
.
trySendBlocking
(
Unit
).
onFailure
{
throw
it
!!
}
}
@SuppressLint
(
"NewApi"
)
...
...
gradle.properties
View file @
1983dec1
...
...
@@ -11,6 +11,7 @@
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier
=
true
android.enableR8.fullMode
=
true
android.enableResourceOptimizations
=
false
android.useAndroidX
=
true
kapt.incremental.apt
=
true
...
...
mobile/build.gradle.kts
View file @
1983dec1
...
...
@@ -12,12 +12,12 @@ setupApp()
android
.
defaultConfig
.
applicationId
=
"com.github.shadowsocks"
dependencies
{
val
cameraxVersion
=
"1.0.0
-rc04
"
val
cameraxVersion
=
"1.0.0"
implementation
(
"androidx.browser:browser:1.3.0"
)
implementation
(
"androidx.camera:camera-camera2:$cameraxVersion"
)
implementation
(
"androidx.camera:camera-lifecycle:$cameraxVersion"
)
implementation
(
"androidx.camera:camera-view:1.0.0-alpha2
3
"
)
implementation
(
"androidx.camera:camera-view:1.0.0-alpha2
4
"
)
implementation
(
"androidx.constraintlayout:constraintlayout:2.0.4"
)
implementation
(
"androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
)
implementation
(
"com.google.mlkit:barcode-scanning:16.1.1"
)
...
...
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
View file @
1983dec1
...
...
@@ -20,7 +20,6 @@
package
com.github.shadowsocks
import
android.annotation.SuppressLint
import
android.content.ActivityNotFoundException
import
android.content.Intent
import
android.graphics.Bitmap
...
...
@@ -49,7 +48,7 @@ import com.github.shadowsocks.bg.BaseService
import
com.github.shadowsocks.database.Profile
import
com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.plugin.PluginConfiguration
import
com.github.shadowsocks.plugin.showAllowingStateLoss
import
com.github.shadowsocks.plugin.
fragment.
showAllowingStateLoss
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.Action
import
com.github.shadowsocks.utils.OpenJson
...
...
@@ -85,7 +84,6 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener, Sea
private
fun
isProfileEditable
(
id
:
Long
)
=
(
activity
as
MainActivity
).
state
==
BaseService
.
State
.
Stopped
||
id
!
in
Core
.
activeProfileIds
@SuppressLint
(
"ValidFragment"
)
class
QRCodeDialog
()
:
DialogFragment
()
{
constructor
(
url
:
String
)
:
this
()
{
arguments
=
bundleOf
(
Pair
(
KEY_URL
,
url
))
...
...
plugin/CHANGES.md
View file @
1983dec1
*
2.0.1:
*
Moved
`AlertDialogFragment`
and related utilities to
`fragment`
package, with support for Fragment Result API from AndroidX Fragment 1.3.
*
Dependency updates:
-
`androidx.fragment:fragment-ktx:1.3.
2
`
;
-
`androidx.fragment:fragment-ktx:1.3.
3
`
;
-
`com.google.android.material:material:1.3.0`
;
-
`org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32`
.
*
2.0.0:
...
...
plugin/build.gradle.kts
View file @
1983dec1
...
...
@@ -26,6 +26,6 @@ dependencies {
api
(
"androidx.core:core-ktx:1.3.2"
)
// https://android-developers.googleblog.com/2019/07/android-q-beta-5-update.html
api
(
"androidx.drawerlayout:drawerlayout:1.1.1"
)
api
(
"androidx.fragment:fragment-ktx:1.3.
2
"
)
api
(
"androidx.fragment:fragment-ktx:1.3.
3
"
)
api
(
"com.google.android.material:material:1.3.0"
)
}
repositories.gradle.kts
View file @
1983dec1
rootProject
.
extra
.
apply
{
set
(
"androidPlugin"
,
"com.android.tools.build:gradle:4.
1.3
"
)
set
(
"kotlinVersion"
,
"1.
4.32
"
)
set
(
"androidPlugin"
,
"com.android.tools.build:gradle:4.
2.0
"
)
set
(
"kotlinVersion"
,
"1.
5.0
"
)
}
repositories
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment