Skip to content

Commit 5b2bd15

Browse files
committed
Refactor the build configs to make the modules's source code can be included by other projects
1 parent e6aa68c commit 5b2bd15

File tree

23 files changed

+385
-60
lines changed

23 files changed

+385
-60
lines changed

.gitignore

+59-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Built application files
22
*.apk
3+
*.aar
34
*.ap_
5+
*.aab
46

5-
# Files for the Dalvik VM
7+
# Files for the ART/Dalvik VM
68
*.dex
79

810
# Java class files
@@ -11,15 +13,14 @@
1113
# Generated files
1214
bin/
1315
gen/
16+
out/
17+
# Uncomment the following line in case you need and you don't have the release build type files in your app
18+
# release/
1419

1520
# Gradle files
1621
.gradle/
1722
build/
1823

19-
# Android Studio files
20-
.idea/
21-
*.iml
22-
2324
# Local configuration file (sdk path, etc)
2425
local.properties
2526

@@ -29,11 +30,59 @@ proguard/
2930
# Log Files
3031
*.log
3132

32-
# Mac OS
33-
.DS_Store
33+
# Android Studio Navigation editor temp files
34+
.navigation/
35+
36+
# Android Studio captures folder
37+
captures/
38+
39+
# IntelliJ
40+
*.iml
41+
.idea/workspace.xml
42+
.idea/tasks.xml
43+
.idea/gradle.xml
44+
.idea/assetWizardSettings.xml
45+
.idea/dictionaries
46+
.idea/libraries
47+
# Android Studio 3 in .gitignore file.
48+
.idea/caches
49+
.idea/modules.xml
50+
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
51+
.idea/navEditor.xml
52+
53+
# Keystore files
54+
# Uncomment the following lines if you do not want to check your keystore files in.
55+
#*.jks
56+
#*.keystore
3457

35-
# JNI objects
36-
obj/
37-
.externalNativeBuild/
58+
# External native build folder generated in Android Studio 2.2 and later
59+
.externalNativeBuild
3860
.cxx/
3961

62+
# Google Services (e.g. APIs or Firebase)
63+
# google-services.json
64+
65+
# Freeline
66+
freeline.py
67+
freeline/
68+
freeline_project_description.json
69+
70+
# fastlane
71+
fastlane/report.xml
72+
fastlane/Preview.html
73+
fastlane/screenshots
74+
fastlane/test_output
75+
fastlane/readme.md
76+
77+
# Version control
78+
vcs.xml
79+
80+
# lint
81+
lint/intermediates/
82+
lint/generated/
83+
lint/outputs/
84+
lint/tmp/
85+
# lint/reports/
86+
87+
# Mac OS
88+
.DS_Store

.idea/.name

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/Project.xml

+116
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+100
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android_module_common.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* File: 'android_module_common.gradle'
33
* Location: https://raw.githubusercontent.com/yongce/AndroidLib/master/android_module_common.gradle
4-
* Version: 2020.03.08
4+
* Version: 2020.03.26
55
* All android projects can copy and include this file.
66
*/
77

@@ -138,8 +138,10 @@ android {
138138
targetCompatibility JavaVersion.VERSION_1_8
139139
}
140140

141-
kotlinOptions {
142-
jvmTarget = "1.8"
141+
pluginManager.withPlugin('kotlin-android') {
142+
kotlinOptions {
143+
jvmTarget = "1.8"
144+
}
143145
}
144146

145147
testOptions {

0 commit comments

Comments
 (0)