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
00411646
Unverified
Commit
00411646
authored
Jan 11, 2020
by
Max Lv
Committed by
GitHub
Jan 11, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2398 from shadowsocks/patch-2391
Plugin 1.3.2
parents
5b018c97
0118802f
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
39 additions
and
12 deletions
+39
-12
build.gradle
build.gradle
+1
-1
core/build.gradle
core/build.gradle
+2
-2
detekt.yml
detekt.yml
+18
-3
mobile/build.gradle
mobile/build.gradle
+2
-2
plugin/CHANGES.md
plugin/CHANGES.md
+6
-0
plugin/build.gradle
plugin/build.gradle
+1
-1
plugin/src/main/AndroidManifest.xml
plugin/src/main/AndroidManifest.xml
+1
-1
plugin/src/main/java/com/github/shadowsocks/plugin/OptionsCapableActivity.kt
...a/com/github/shadowsocks/plugin/OptionsCapableActivity.kt
+1
-1
plugin/src/test/java/com/github/shadowsocks/plugin/PluginOptionsTest.kt
...t/java/com/github/shadowsocks/plugin/PluginOptionsTest.kt
+6
-0
tv/build.gradle
tv/build.gradle
+1
-1
No files found.
build.gradle
View file @
00411646
...
...
@@ -10,7 +10,7 @@ buildscript {
sdkVersion
=
29
compileSdkVersion
=
29
lifecycleVersion
=
'2.2.0-rc03'
junitVersion
=
'4.1
2
'
junitVersion
=
'4.1
3
'
androidTestVersion
=
'1.2.0'
androidEspressoVersion
=
'3.2.0'
versionCode
=
4080750
...
...
core/build.gradle
View file @
00411646
...
...
@@ -49,7 +49,7 @@ androidExtensions {
}
def
coroutinesVersion
=
'1.3.3'
def
roomVersion
=
'2.2.
2
'
def
roomVersion
=
'2.2.
3
'
def
workVersion
=
'2.2.0'
dependencies
{
api
project
(
':plugin'
)
...
...
@@ -64,7 +64,7 @@ dependencies {
api
'com.crashlytics.sdk.android:crashlytics:2.10.1'
api
'com.google.code.gson:gson:2.8.6'
api
'com.google.firebase:firebase-analytics:17.2.1'
api
'com.google.firebase:firebase-config:19.
0.4
'
api
'com.google.firebase:firebase-config:19.
1.0
'
api
'dnsjava:dnsjava:2.1.9'
api
"org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
api
"org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion"
...
...
detekt.yml
View file @
00411646
# https://github.com/arturbosch/detekt/blob/1.
1
.1/detekt-cli/src/main/resources/default-detekt-config.yml
# https://github.com/arturbosch/detekt/blob/1.
3
.1/detekt-cli/src/main/resources/default-detekt-config.yml
comments
:
active
:
false
...
...
@@ -14,9 +14,11 @@ complexity:
includeStaticDeclarations
:
false
ComplexMethod
:
active
:
true
threshold
:
1
0
threshold
:
1
5
ignoreSingleWhenExpression
:
false
ignoreSimpleWhenEntries
:
false
ignoreNestingFunctions
:
false
nestingFunctions
:
run,let,apply,with,also,use,forEach,isNotNull,ifNull
LabeledExpression
:
active
:
false
ignoredLabels
:
"
"
...
...
@@ -245,6 +247,7 @@ naming:
parameterPattern
:
'
[a-z][A-Za-z0-9]*'
privateParameterPattern
:
'
[a-z][A-Za-z0-9]*'
excludeClassPattern
:
'
$^'
ignoreOverridden
:
true
EnumNaming
:
active
:
true
excludes
:
"
**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
...
...
@@ -337,6 +340,8 @@ potential-bugs:
active
:
true
HasPlatformType
:
active
:
true
ImplicitDefaultLocale
:
active
:
true
InvalidRange
:
active
:
true
IteratorHasNextCallsNextMethod
:
...
...
@@ -345,6 +350,8 @@ potential-bugs:
active
:
true
LateinitUsage
:
active
:
false
MapGetWithNotNullAssertionOperator
:
active
:
true
MissingWhenCase
:
active
:
false
RedundantElseInWhen
:
...
...
@@ -354,7 +361,7 @@ potential-bugs:
UnreachableCode
:
active
:
true
UnsafeCallOnNullableType
:
active
:
fals
e
active
:
tru
e
UnsafeCast
:
active
:
false
UselessPostfixExpression
:
...
...
@@ -387,6 +394,12 @@ style:
active
:
true
imports
:
'
'
forbiddenPatterns
:
"
"
ForbiddenMethodCall
:
active
:
true
methods
:
'
'
ForbiddenPublicDataClass
:
active
:
true
ignorePackages
:
'
*.internal,*.internal.*'
ForbiddenVoid
:
active
:
true
ignoreOverridden
:
true
...
...
@@ -453,6 +466,8 @@ style:
UnnecessaryAbstractClass
:
active
:
true
excludeAnnotatedClasses
:
"
dagger.Module"
UnnecessaryAnnotationUseSiteTarget
:
active
:
true
UnnecessaryApply
:
active
:
true
UnnecessaryInheritance
:
...
...
mobile/build.gradle
View file @
00411646
...
...
@@ -60,8 +60,8 @@ androidExtensions {
dependencies
{
implementation
project
(
':core'
)
implementation
'androidx.browser:browser:1.2.0
-rc01
'
implementation
'androidx.constraintlayout:constraintlayout:2.0.0-beta
3
'
implementation
'androidx.browser:browser:1.2.0'
implementation
'androidx.constraintlayout:constraintlayout:2.0.0-beta
4
'
implementation
"androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
implementation
'com.google.android.gms:play-services-vision:19.0.0'
implementation
'com.google.firebase:firebase-ads:18.3.0'
...
...
plugin/CHANGES.md
View file @
00411646
*
1.3.2:
*
Fix first key-value pair disappearing with null value. (#2391)
*
Dependency updates:
-
`androidx.core:core-ktx:1.1.0`
;
-
`com.google.android.material:material:1.1.0-rc01`
;
-
`org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61`
.
*
1.3.1:
*
New theme resource
`Theme.Shadowsocks.Immersive`
for better Android Q-esque translucent navigation bars.
This is an opt-in feature.
...
...
plugin/build.gradle
View file @
00411646
...
...
@@ -57,7 +57,7 @@ mavenPublish {
dependencies
{
api
'androidx.core:core-ktx:1.1.0'
api
'androidx.drawerlayout:drawerlayout:1.1.0-alpha03'
// https://android-developers.googleblog.com/2019/07/android-q-beta-5-update.html
api
'com.google.android.material:material:1.1.0-
beta02
'
api
'com.google.android.material:material:1.1.0-
rc01
'
api
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
testImplementation
"junit:junit:$junitVersion"
androidTestImplementation
"androidx.test:runner:$androidTestVersion"
...
...
plugin/src/main/AndroidManifest.xml
View file @
00411646
...
...
@@ -3,6 +3,6 @@
<application
android:theme=
"@style/Theme.Shadowsocks"
>
<meta-data
android:name=
"com.github.shadowsocks.plugin.version"
android:value=
"1.3.
1
"
/>
android:value=
"1.3.
2
"
/>
</application>
</manifest>
plugin/src/main/java/com/github/shadowsocks/plugin/OptionsCapableActivity.kt
View file @
00411646
...
...
@@ -30,7 +30,7 @@ import androidx.appcompat.app.AppCompatActivity
*/
abstract
class
OptionsCapableActivity
:
AppCompatActivity
()
{
protected
fun
pluginOptions
(
intent
:
Intent
=
this
.
intent
)
=
try
{
PluginOptions
(
intent
.
getStringExtra
(
PluginContract
.
EXTRA_OPTIONS
))
PluginOptions
(
""
,
intent
.
getStringExtra
(
PluginContract
.
EXTRA_OPTIONS
))
}
catch
(
exc
:
IllegalArgumentException
)
{
Toast
.
makeText
(
this
,
exc
.
message
,
Toast
.
LENGTH_SHORT
).
show
()
PluginOptions
()
...
...
plugin/src/test/java/com/github/shadowsocks/plugin/PluginOptionsTest.kt
View file @
00411646
...
...
@@ -36,6 +36,12 @@ class PluginOptionsTest {
Assert
.
assertEquals
(
true
,
o3
==
o4
)
}
@Test
fun
nullValues
()
{
val
o
=
PluginOptions
(
""
,
"a;b;c;d=3"
)
Assert
.
assertEquals
(
true
,
o
==
PluginOptions
(
""
,
o
.
toString
()))
}
@Test
fun
escape
()
{
val
options
=
PluginOptions
(
"escapeTest"
)
...
...
tv/build.gradle
View file @
00411646
...
...
@@ -56,7 +56,7 @@ android {
dependencies
{
implementation
project
(
':core'
)
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
"androidx.leanback:leanback-preference:1.1.0-alpha02"
implementation
'androidx.leanback:leanback-preference:1.1.0-alpha03'
}
apply
plugin:
'com.google.gms.google-services'
...
...
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