Skip to content

Commit

Permalink
Refactor the build configs to make the modules's source code can be i…
Browse files Browse the repository at this point in the history
…ncluded by other projects
  • Loading branch information
yongce committed Mar 25, 2020
1 parent e6aa68c commit 5b2bd15
Show file tree
Hide file tree
Showing 23 changed files with 385 additions and 60 deletions.
69 changes: 59 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Built application files
*.apk
*.aar
*.ap_
*.aab

# Files for the Dalvik VM
# Files for the ART/Dalvik VM
*.dex

# Java class files
Expand All @@ -11,15 +13,14 @@
# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/

# Gradle files
.gradle/
build/

# Android Studio files
.idea/
*.iml

# Local configuration file (sdk path, etc)
local.properties

Expand All @@ -29,11 +30,59 @@ proguard/
# Log Files
*.log

# Mac OS
.DS_Store
# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml

# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore

# JNI objects
obj/
.externalNativeBuild/
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/

# Google Services (e.g. APIs or Firebase)
# google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json

# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md

# Version control
vcs.xml

# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/

# Mac OS
.DS_Store
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 116 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 100 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions android_module_common.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* File: 'android_module_common.gradle'
* Location: https://raw.githubusercontent.com/yongce/AndroidLib/master/android_module_common.gradle
* Version: 2020.03.08
* Version: 2020.03.26
* All android projects can copy and include this file.
*/

Expand Down Expand Up @@ -138,8 +138,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
pluginManager.withPlugin('kotlin-android') {
kotlinOptions {
jvmTarget = "1.8"
}
}

testOptions {
Expand Down
Loading

0 comments on commit 5b2bd15

Please sign in to comment.