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
1783420a
Commit
1783420a
authored
Oct 02, 2020
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update dependencies
parent
70d509e1
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
21 additions
and
19 deletions
+21
-19
build.gradle.kts
build.gradle.kts
+7
-5
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/rust/shadowsocks-rust
core/src/main/rust/shadowsocks-rust
+1
-1
mobile/build.gradle.kts
mobile/build.gradle.kts
+4
-4
mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt
...e/src/main/java/com/github/shadowsocks/ScannerActivity.kt
+1
-1
plugin/build.gradle.kts
plugin/build.gradle.kts
+1
-1
repositories.gradle.kts
repositories.gradle.kts
+2
-2
tv/build.gradle.kts
tv/build.gradle.kts
+1
-1
No files found.
build.gradle.kts
View file @
1783420a
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins
{
id
(
"com.github.ben-manes.versions"
)
version
"0.
29
.0"
id
(
"com.github.ben-manes.versions"
)
version
"0.
33
.0"
}
buildscript
{
...
...
@@ -14,13 +14,15 @@ buildscript {
}
dependencies
{
val
kotlinVersion
=
rootProject
.
extra
.
get
(
"kotlinVersion"
).
toString
()
classpath
(
rootProject
.
extra
.
get
(
"androidPlugin"
).
toString
())
classpath
(
kotlin
(
"gradle-plugin"
,
rootProject
.
extra
.
get
(
"kotlinVersion"
).
toString
()
))
classpath
(
kotlin
(
"gradle-plugin"
,
kotlinVersion
))
classpath
(
"com.google.android.gms:oss-licenses-plugin:0.10.2"
)
classpath
(
"com.google.firebase:firebase-crashlytics-gradle:2.
2.1
"
)
classpath
(
"com.google.gms:google-services:4.3.
3
"
)
classpath
(
"com.vanniktech:gradle-maven-publish-plugin:0.1
2
.0"
)
classpath
(
"com.google.firebase:firebase-crashlytics-gradle:2.
3.0
"
)
classpath
(
"com.google.gms:google-services:4.3.
4
"
)
classpath
(
"com.vanniktech:gradle-maven-publish-plugin:0.1
3
.0"
)
classpath
(
"gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3"
)
classpath
(
"org.jetbrains.dokka:dokka-gradle-plugin:$kotlinVersion"
)
}
}
...
...
buildSrc/src/main/kotlin/Helpers.kt
View file @
1783420a
...
...
@@ -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-
alpha07
"
const
val
lifecycleVersion
=
"2.3.0-
beta01
"
private
val
Project
.
android
get
()
=
extensions
.
getByName
<
BaseExtension
>(
"android"
)
...
...
core/build.gradle.kts
View file @
1783420a
...
...
@@ -75,7 +75,7 @@ dependencies {
api
(
"androidx.appcompat:appcompat:1.2.0"
)
api
(
"androidx.core:core-ktx:1.4.0-alpha01"
)
api
(
"androidx.fragment:fragment-ktx:1.3.0-
alpha08
"
)
api
(
"androidx.fragment:fragment-ktx:1.3.0-
beta01
"
)
api
(
"androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
)
api
(
"androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion"
)
api
(
"androidx.preference:preference:1.1.1"
)
...
...
@@ -86,9 +86,9 @@ dependencies {
api
(
"com.google.code.gson:gson:2.8.6"
)
api
(
"com.google.firebase:firebase-analytics-ktx:17.5.0"
)
api
(
"com.google.firebase:firebase-config-ktx:19.2.0"
)
api
(
"com.google.firebase:firebase-crashlytics:17.2.
1
"
)
api
(
"com.google.firebase:firebase-crashlytics:17.2.
2
"
)
api
(
"com.jakewharton.timber:timber:4.7.1"
)
api
(
"dnsjava:dnsjava:3.
2.2
"
)
api
(
"dnsjava:dnsjava:3.
3.0
"
)
api
(
"org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
)
api
(
"org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion"
)
kapt
(
"androidx.room:room-compiler:$roomVersion"
)
...
...
shadowsocks-rust
@
988e69d4
Subproject commit
5af929004e3bef4d330de277de8a3fb32ce961b3
Subproject commit
988e69d4dab676df9a61daf692765c353f5eb6f9
mobile/build.gradle.kts
View file @
1783420a
...
...
@@ -12,17 +12,17 @@ setupApp()
android
.
defaultConfig
.
applicationId
=
"com.github.shadowsocks"
dependencies
{
val
cameraxVersion
=
"1.0.0-beta
08
"
val
cameraxVersion
=
"1.0.0-beta
10
"
implementation
(
"androidx.browser:browser:1.2.0"
)
implementation
(
"androidx.camera:camera-camera2:$cameraxVersion"
)
implementation
(
"androidx.camera:camera-lifecycle:$cameraxVersion"
)
implementation
(
"androidx.camera:camera-view:1.0.0-alpha1
5
"
)
implementation
(
"androidx.camera:camera-view:1.0.0-alpha1
7
"
)
implementation
(
"androidx.constraintlayout:constraintlayout:2.0.1"
)
implementation
(
"androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
)
implementation
(
"com.google.firebase:firebase-ads:19.
3
.0"
)
implementation
(
"com.google.firebase:firebase-ads:19.
4
.0"
)
implementation
(
"com.google.mlkit:barcode-scanning:16.0.3"
)
implementation
(
"com.google.zxing:core:3.4.
0
"
)
implementation
(
"com.google.zxing:core:3.4.
1
"
)
implementation
(
"com.takisoft.preferencex:preferencex-simplemenu:1.1.0"
)
implementation
(
"com.twofortyfouram:android-plugin-api-for-locale:1.0.4"
)
implementation
(
"me.zhanghai.android.fastscroll:library:1.1.4"
)
...
...
mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt
View file @
1783420a
...
...
@@ -98,7 +98,7 @@ class ScannerActivity : AppCompatActivity(), ImageAnalysis.Analyzer {
CameraSelector
.
DEFAULT_BACK_CAMERA
}
else
CameraSelector
.
DEFAULT_FRONT_CAMERA
val
preview
=
Preview
.
Builder
().
build
()
preview
.
setSurfaceProvider
(
findViewById
<
PreviewView
>(
R
.
id
.
barcode
).
createSurfaceProvider
()
)
preview
.
setSurfaceProvider
(
findViewById
<
PreviewView
>(
R
.
id
.
barcode
).
surfaceProvider
)
try
{
cameraProvider
.
bindToLifecycle
(
this
@ScannerActivity
,
selector
,
preview
,
imageAnalysis
)
}
catch
(
e
:
IllegalArgumentException
)
{
...
...
plugin/build.gradle.kts
View file @
1783420a
...
...
@@ -22,7 +22,7 @@ mavenPublish.targets.getByName("uploadArchives") {
}
dependencies
{
api
(
"androidx.core:core-ktx:1.3.
1
"
)
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
(
"com.google.android.material:material:1.2.1"
)
...
...
repositories.gradle.kts
View file @
1783420a
rootProject
.
extra
.
apply
{
set
(
"androidPlugin"
,
"com.android.tools.build:gradle:4.1.0-rc0
2
"
)
set
(
"kotlinVersion"
,
"1.4.0"
)
set
(
"androidPlugin"
,
"com.android.tools.build:gradle:4.1.0-rc0
3
"
)
set
(
"kotlinVersion"
,
"1.4.
1
0"
)
}
repositories
{
...
...
tv/build.gradle.kts
View file @
1783420a
...
...
@@ -12,5 +12,5 @@ setupApp()
android
.
defaultConfig
.
applicationId
=
"com.github.shadowsocks.tv"
dependencies
{
implementation
(
"androidx.leanback:leanback-preference:1.1.0-alpha0
4
"
)
implementation
(
"androidx.leanback:leanback-preference:1.1.0-alpha0
5
"
)
}
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