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
d3af7644
Commit
d3af7644
authored
Aug 23, 2020
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build
parent
c852fc24
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
19 deletions
+16
-19
buildSrc/src/main/kotlin/Helpers.kt
buildSrc/src/main/kotlin/Helpers.kt
+11
-1
core/build.gradle.kts
core/build.gradle.kts
+2
-1
core/lint.xml
core/lint.xml
+0
-8
mobile/build.gradle.kts
mobile/build.gradle.kts
+3
-3
plugin/lint.xml
plugin/lint.xml
+0
-6
No files found.
buildSrc/src/main/kotlin/Helpers.kt
View file @
d3af7644
...
@@ -11,7 +11,7 @@ import org.gradle.kotlin.dsl.getByName
...
@@ -11,7 +11,7 @@ import org.gradle.kotlin.dsl.getByName
import
org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import
org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import
java.util.*
import
java.util.*
const
val
lifecycleVersion
=
"2.3.0-alpha0
6
"
const
val
lifecycleVersion
=
"2.3.0-alpha0
7
"
private
val
Project
.
android
get
()
=
extensions
.
getByName
<
BaseExtension
>(
"android"
)
private
val
Project
.
android
get
()
=
extensions
.
getByName
<
BaseExtension
>(
"android"
)
...
@@ -36,6 +36,11 @@ fun Project.setupCommon() {
...
@@ -36,6 +36,11 @@ fun Project.setupCommon() {
sourceCompatibility
=
javaVersion
sourceCompatibility
=
javaVersion
targetCompatibility
=
javaVersion
targetCompatibility
=
javaVersion
}
}
lintOptions
{
warning
(
"ExtraTranslation"
)
warning
(
"ImpliedQuantity"
)
informational
(
"MissingTranslation"
)
}
(
this
as
ExtensionAware
).
extensions
.
getByName
<
KotlinJvmOptions
>(
"kotlinOptions"
).
jvmTarget
=
(
this
as
ExtensionAware
).
extensions
.
getByName
<
KotlinJvmOptions
>(
"kotlinOptions"
).
jvmTarget
=
javaVersion
.
toString
()
javaVersion
.
toString
()
}
}
...
@@ -55,6 +60,11 @@ fun Project.setupCore() {
...
@@ -55,6 +60,11 @@ fun Project.setupCore() {
versionName
=
"5.1.2-nightly"
versionName
=
"5.1.2-nightly"
}
}
compileOptions
.
isCoreLibraryDesugaringEnabled
=
true
compileOptions
.
isCoreLibraryDesugaringEnabled
=
true
lintOptions
{
disable
(
"BadConfigurationProvider"
)
warning
(
"RestrictedApi"
)
disable
(
"UseAppTint"
)
}
ndkVersion
=
"21.3.6528147"
ndkVersion
=
"21.3.6528147"
}
}
dependencies
.
add
(
"coreLibraryDesugaring"
,
"com.android.tools:desugar_jdk_libs:1.0.9"
)
dependencies
.
add
(
"coreLibraryDesugaring"
,
"com.android.tools:desugar_jdk_libs:1.0.9"
)
...
...
core/build.gradle.kts
View file @
d3af7644
...
@@ -71,9 +71,10 @@ dependencies {
...
@@ -71,9 +71,10 @@ dependencies {
val
workVersion
=
"2.4.0"
val
workVersion
=
"2.4.0"
api
(
project
(
":plugin"
))
api
(
project
(
":plugin"
))
api
(
"androidx.appcompat:appcompat:1.2.0"
)
api
(
"androidx.core:core-ktx:1.4.0-alpha01"
)
api
(
"androidx.core:core-ktx:1.4.0-alpha01"
)
api
(
"androidx.fragment:fragment-ktx:1.3.0-alpha0
7
"
)
api
(
"androidx.fragment:fragment-ktx:1.3.0-alpha0
8
"
)
api
(
"androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
)
api
(
"androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
)
api
(
"androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion"
)
api
(
"androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion"
)
api
(
"androidx.preference:preference:1.1.1"
)
api
(
"androidx.preference:preference:1.1.1"
)
...
...
core/lint.xml
deleted
100644 → 0
View file @
c852fc24
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue
id=
"BadConfigurationProvider"
severity=
"informational"
/>
<issue
id=
"ImpliedQuantity"
severity=
"warning"
/>
<issue
id=
"ExtraTranslation"
severity=
"warning"
/>
<issue
id=
"MissingDefaultResource"
severity=
"warning"
/>
<issue
id=
"MissingTranslation"
severity=
"informational"
/>
</lint>
mobile/build.gradle.kts
View file @
d3af7644
...
@@ -12,13 +12,13 @@ setupApp()
...
@@ -12,13 +12,13 @@ setupApp()
android
.
defaultConfig
.
applicationId
=
"com.github.shadowsocks"
android
.
defaultConfig
.
applicationId
=
"com.github.shadowsocks"
dependencies
{
dependencies
{
val
cameraxVersion
=
"1.0.0-beta0
7
"
val
cameraxVersion
=
"1.0.0-beta0
8
"
implementation
(
"androidx.browser:browser:1.2.0"
)
implementation
(
"androidx.browser:browser:1.2.0"
)
implementation
(
"androidx.camera:camera-camera2:$cameraxVersion"
)
implementation
(
"androidx.camera:camera-camera2:$cameraxVersion"
)
implementation
(
"androidx.camera:camera-lifecycle:$cameraxVersion"
)
implementation
(
"androidx.camera:camera-lifecycle:$cameraxVersion"
)
implementation
(
"androidx.camera:camera-view:1.0.0-alpha1
4
"
)
implementation
(
"androidx.camera:camera-view:1.0.0-alpha1
5
"
)
implementation
(
"androidx.constraintlayout:constraintlayout:2.0.0
-rc1
"
)
implementation
(
"androidx.constraintlayout:constraintlayout:2.0.0"
)
implementation
(
"androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
)
implementation
(
"androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
)
implementation
(
"com.google.firebase:firebase-ads:19.3.0"
)
implementation
(
"com.google.firebase:firebase-ads:19.3.0"
)
implementation
(
"com.google.mlkit:barcode-scanning:16.0.2"
)
implementation
(
"com.google.mlkit:barcode-scanning:16.0.2"
)
...
...
plugin/lint.xml
deleted
100644 → 0
View file @
c852fc24
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue
id=
"ImpliedQuantity"
severity=
"warning"
/>
<issue
id=
"ExtraTranslation"
severity=
"warning"
/>
<issue
id=
"MissingTranslation"
severity=
"informational"
/>
</lint>
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