Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #4

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified RxArchitecture/.idea/caches/build_file_checksums.ser
Binary file not shown.
6 changes: 6 additions & 0 deletions RxArchitecture/.idea/encodings.xml

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

58 changes: 58 additions & 0 deletions RxArchitecture/.idea/inspectionProfiles/Project_Default.xml

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

4 changes: 3 additions & 1 deletion RxArchitecture/.idea/misc.xml

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

6 changes: 6 additions & 0 deletions RxArchitecture/.idea/smartfox_info.xml

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

16 changes: 7 additions & 9 deletions RxArchitecture/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
apply plugin: 'com.android.application'
apply plugin: 'com.alibaba.arouter'
apply plugin: 'org.greenrobot.greendao'

android {
compileSdkVersion Versions.compileSdkVersion
buildToolsVersion Versions.buildToolsVersion
buildToolsVersion '28.0.3'
defaultConfig {
applicationId Versions.applicationId
minSdkVersion Versions.minSdkVersion
Expand All @@ -21,7 +19,7 @@ android {

ndk {
// 设置支持的SO库架构
abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
abiFilters 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
}
}
buildTypes {
Expand All @@ -41,12 +39,12 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile project(':baselib')
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':baselib')
if (!isModule.toBoolean()) {
compile project(':model_zhihu')
compile project(':model_gank')
compile project(':model_journalism')
implementation project(':model_zhihu')
implementation project(':model_gank')
implementation project(':model_journalism')
}

}
81 changes: 39 additions & 42 deletions RxArchitecture/baselib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,71 +38,68 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
api fileTree(include: ['*.jar'], dir: 'libs')
// view
compile Libs.support_appcompat_v7
compile Libs.support_cardview
compile Libs.support_recyclerview
compile Libs.support_design
compile Libs.support_support_v4
compile Libs.support_constraint_layout
api Libs.support_appcompat_v7
api Libs.support_cardview
api Libs.support_recyclerview
api Libs.support_design
api Libs.support_support_v4
api Libs.support_constraint_layout

// lifecycle
// https://github.com/rebeccahughes/react-native-device-info/issues/414
compile Libs.arch_lifecycle_runtime
compile Libs.arch_lifecycle_extensions
api Libs.arch_lifecycle_runtime
api Libs.arch_lifecycle_extensions
annotationProcessor Libs.arch_lifecycle_compiler

// glide
compile Libs.glide
api Libs.glide
// 沉浸式状态栏和沉浸式导航栏管理
compile Libs.barlibrary
api Libs.barlibrary
// fragmentation
compile Libs.fragmentation
api Libs.fragmentation
// baseAdapter
compile Libs.baseRecyclerViewAdapterHelper
api Libs.baseRecyclerViewAdapterHelper
// // Butter Knife
// compile Libs.butterknife
// api Libs.butterknife
// annotationProcessor Libs.butterknife_compiler
// RxJava
compile Libs.rxandroid
compile Libs.rxjava
compile Libs.rxPermission
api Libs.rxandroid
api Libs.rxjava
api Libs.rxPermission
// greendao
compile Libs.greendao
api Libs.greendao
// newWork
compile Libs.retrofit
compile Libs.retrofit_converter_gson
compile Libs.retrofit_adapter_rxjava2
api Libs.retrofit
api Libs.retrofit_converter_gson
api Libs.retrofit_adapter_rxjava2

compile Libs.okhttp3_interceptor
compile Libs.okhttp3
compile Libs.stetho
compile Libs.stetho_okhttp3
api Libs.okhttp3_interceptor
api Libs.okhttp3
api Libs.stetho
api Libs.stetho_okhttp3
// logger
compile Libs.logger
api Libs.logger
// banner
compile Libs.banner
api Libs.banner

compile Libs.eventbus_activity_scope
compile Libs.eventbus
api Libs.eventbus_activity_scope
api Libs.eventbus

compile Libs.bugly_crashreport //其中latest.release指代最新Bugly SDK版本号,也可以指定明确的版本号,例如2.1.9
compile Libs.bugly_nativecrashreport //其中latest.release指代最新Bugly NDK版本号,也可以指定明确的版本号,例如3.0
// compile Libs.javax_inject
// 讯飞语音
compile files('libs/Msc.jar')
api Libs.bugly_crashreport //其中latest.release指代最新Bugly SDK版本号,也可以指定明确的版本号,例如2.1.9
api Libs.bugly_nativecrashreport //其中latest.release指代最新Bugly NDK版本号,也可以指定明确的版本号,例如3.0
// ARouter
compile Libs.arouter_api
compile Libs.arouter_annotation
api Libs.arouter_api
api Libs.arouter_annotation
annotationProcessor Libs.arouter_compiler

testCompile Libs.test_junit
testCompile Libs.test_mockito_core
testCompile Libs.robolectric
testCompile Libs.robolectric_shadows_support_v4
testCompile Libs.okhttp3_mockwebserver
testCompile (Libs.core_testing, {
testImplementation Libs.test_junit
testImplementation Libs.test_mockito_core
testImplementation Libs.robolectric
testImplementation Libs.robolectric_shadows_support_v4
testImplementation Libs.okhttp3_mockwebserver
testImplementation (Libs.core_testing, {
exclude group: 'com.android.support', module: 'support-compat'
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.android.support', module: 'support-core-utils'
Expand Down
14 changes: 7 additions & 7 deletions RxArchitecture/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
apply plugin: 'com.alibaba.arouter'
buildscript {
repositories {
maven { url "https://maven.google.com" }
mavenCentral()
google()
jcenter()
maven { url "https://jitpack.io" }
maven { url 'https://dl.bintray.com/yokeyword/maven/' }
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0'
classpath "com.alibaba:arouter-register:1.0.2"
Expand All @@ -18,11 +18,11 @@ buildscript {

allprojects {
repositories {
maven { url "https://maven.google.com" }
mavenCentral()
google()
jcenter()
maven { url "https://jitpack.io" }
maven { url 'https://dl.bintray.com/yokeyword/maven/' }
jcenter()
mavenCentral()
}
}

Expand Down
10 changes: 5 additions & 5 deletions RxArchitecture/buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ object Versions {
val applicationId_xinwen = "com.minister.architecture.xinwen"
val applicationId_gank = "com.minister.architecture.gank"

val compileSdkVersion = 26
val buildToolsVersion = "26.0.2"
val compileSdkVersion = 28
val buildToolsVersion = "28.0.0-alpha1"

val minSdkVersion = 22
val targetSdkVersion = 26
val targetSdkVersion = 28
val versionCode = 1
val versionName = "1.0"

val support_lib = "26.1.0"
val support_lib = "28.0.0-alpha1"
val constraint_layout = "1.1.1"
val lifecycle_lib = "1.1.1"
val fragmentation = "1.3.3"
Expand All @@ -28,7 +28,7 @@ object Versions {
val stetho_lib = "1.5.0"
val logger = "2.1.1"
val banner = "1.4.10"
val eventbus = "3.0.0"
val eventbus = "3.1.1"
val eventbus_activity_scope = "1.0.0"

val test_junit = "4.12"
Expand Down
4 changes: 2 additions & 2 deletions RxArchitecture/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 12 09:43:35 CST 2018
#Fri Oct 26 15:26:03 CST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
12 changes: 7 additions & 5 deletions RxArchitecture/model_gank/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply plugin: 'com.alibaba.arouter'

android {
compileSdkVersion Versions.compileSdkVersion
buildToolsVersion Versions.buildToolsVersion
buildToolsVersion '28.0.3'


defaultConfig {
Expand Down Expand Up @@ -49,11 +49,13 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':baselib')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':baselib')

implementation 'com.github.Commit451:NativeStackBlur:1.0.5'

// ARouter
compile Libs.arouter_api
compile Libs.arouter_annotation
implementation Libs.arouter_api
implementation Libs.arouter_annotation
annotationProcessor Libs.arouter_compiler
}
Loading