diff --git a/build.gradle b/build.gradle index 40fe932..59e34d8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,41 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - apply from: 'versions.gradle' - addRepos(repositories) +// apply from: 'versions.gradle' +// apply from: 'support.gradle' +// addRepos(repositories) + ext{ + kotlin_version = '1.3.20' + appcompat_version = '27.1.1' + constraint_layout = '1.1.3' + min_sdk = 16 + target_sdk = 27 + build_tools = "27.0.3" + } dependencies { /* classpath deps.android_gradle_plugin*/ - classpath deps.android_gradle_plugin - classpath deps.kotlin.plugin + classpath "com.android.tools.build:gradle:3.3.2" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } + repositories { + google() + jcenter() + } } allprojects { - addRepos(repositories) +// addRepos(repositories) + repositories { + google() + jcenter() + mavenCentral() + //Add the JitPack repository + maven { url "https://jitpack.io" } + maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} + } + // Android dependency 'com.android.support:design' has different version for the compile (25.3.1) and runtime (25.4.0) classpath. // You should manually set the same version via DependencyResolution subprojects { @@ -21,7 +43,7 @@ allprojects { resolutionStrategy.eachDependency { details -> if (details.requested.group == 'com.android.support' && !details.requested.name.contains('multidex')) { - details.useVersion "27.0.2" + details.useVersion "27.1.1" } } } @@ -35,4 +57,15 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir +} +repositories { + google() +} + +ext{ + appcompat_version = '27.1.1' + constraint_layout = '1.1.3' + min_sdk = 16 + target_sdk = 27 + build_tools = "27.0.3" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9b51cd5..474f4f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,8 +19,12 @@ org.gradle.daemon=true org.gradle.configureondemand=true org.gradle.parallel=true # ���ֵһ������AndroidStudio�汾��һ�� -localGradlePluginVersion=3.0.1 +localGradlePluginVersion=3.1.3 +appcompat_version=27.1.1 +constraint_layout=1.1.3 +retrofit = '2.3.0' # ÿ�θ��ġ�isModule����ֵ����Ҫ��� "Sync Project" ��ť # isModule�ǡ����ɿ���ģʽ���͡��������ģʽ�����л����� isModule=false + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a8b220f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Mar 27 08:54:56 CST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lib_common/build.gradle b/lib_common/build.gradle index 87eb2af..ba94831 100644 --- a/lib_common/build.gradle +++ b/lib_common/build.gradle @@ -1,20 +1,19 @@ apply plugin: 'com.android.library' android { - compileSdkVersion build_versions.target_sdk + compileSdkVersion 27 defaultConfig { - minSdkVersion build_versions.min_sdk - targetSdkVersion build_versions.target_sdk + minSdkVersion min_sdk + targetSdkVersion target_sdk versionCode 1 versionName "1.0" - } - + javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } } + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - buildTypes { release { buildConfigField "boolean", "LOG_DEBUG", "true" @@ -25,52 +24,51 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - } dependencies { api fileTree(include: ['*.jar'], dir: 'libs') // Support libraries - api deps.support.app_compat - api deps.support.v4 - api deps.support.v13 - api deps.support.design - api deps.support.cardview - api deps.support.percent - api deps.support.recyclerview - api deps.constraint_layout + api "com.android.support:appcompat-v7:${rootProject.ext.appcompat_version}" + api "com.android.support:support-v4:${rootProject.ext.appcompat_version}" + api "com.android.support:support-v13:${rootProject.ext.appcompat_version}" + api "com.android.support:percent:${rootProject.ext.appcompat_version}" + api "com.android.support:recyclerview-v7:${rootProject.ext.appcompat_version}" + api "com.android.support:cardview-v7:${rootProject.ext.appcompat_version}" + api "com.android.support:design:${rootProject.ext.appcompat_version}" + api "com.android.support.constraint:constraint-layout:${rootProject.ext.constraint_layout}" // RxJava and retrofit - api deps.rx_android - api deps.rxjava2 - api deps.retrofit.runtime - api deps.retrofit.gson - api deps.persistent_cookie - + api "io.reactivex.rxjava2:rxjava:2.2.2" + api "io.reactivex.rxjava2:rxandroid:2.1.0" + api "com.squareup.retrofit2:retrofit:2.4.0" + api "com.squareup.retrofit2:converter-gson:2.4.0" + api "com.squareup.retrofit2:converter-gson:2.4.0" + api "com.github.franmontiel:PersistentCookieJar:v1.0.1" //Dagger - api deps.dagger.runtime - api deps.dagger.android - api deps.dagger.android_support - + api "com.google.dagger:dagger:2.17" + api "com.google.dagger:dagger-android:2.17" + api "com.google.dagger:dagger-android-support:2.17" // other - api deps.kotlin.stdlib - api deps.event_bus - api deps.gson - api deps.permission - api deps.utils - api deps.glide - + api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + api "org.greenrobot:eventbus:3.1.1" + api "com.google.code.gson:gson:2.8.5" + api "com.yanzhenjie:permission:1.1.2" + api "com.blankj:utilcode:1.10.0" + api "com.github.bumptech.glide:glide:3.8.0" //view - api deps.photo_view - api deps.easy_recycler - api deps.material_dialog - api deps.logger - api deps.toasty - + api "com.github.chrisbanes:PhotoView:2.0.0" + api "com.jude:easyrecyclerview:4.4.2" + api "com.afollestad.material-dialogs:core:0.9.6.0" + api "com.orhanobut:logger:1.15" + api "com.github.GrenderG:Toasty:1.1.3" //router - api deps.arouter_api - + api "com.alibaba:arouter-api:1.3.1" //annotationProcessor - annotationProcessor deps.dagger.android_support_compiler - annotationProcessor deps.dagger.compiler + annotationProcessor "com.google.dagger:dagger-compiler:2.17" + annotationProcessor "com.google.dagger:dagger-android-processor:2.17" +} + +repositories { + google() } diff --git a/module_app/build.gradle b/module_app/build.gradle index 2776c5c..4e6607c 100644 --- a/module_app/build.gradle +++ b/module_app/build.gradle @@ -9,7 +9,7 @@ def keystoreProperties = new Properties() keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) static def buildTime() { - return new Date().format("yyyyMMdd"); + return new Date().format("yyyyMMdd") } android { @@ -21,25 +21,23 @@ android { storePassword keystoreProperties['storePassword'] } } - - compileSdkVersion build_versions.target_sdk + compileSdkVersion 27 defaultConfig { applicationId "com.guiying.module" - minSdkVersion build_versions.min_sdk - targetSdkVersion build_versions.target_sdk + minSdkVersion min_sdk + targetSdkVersion target_sdk versionCode 1 versionName "1.0" multiDexEnabled true + //打包时间 resValue "string", "build_time", buildTime() - } - + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - buildTypes { release { //更改AndroidManifest.xml中预先定义好占位符信息 @@ -68,13 +66,11 @@ android { debuggable true } } - - } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation deps.support.multidex + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation "com.android.support:multidex:1.0.3" implementation project(':lib_common') if (!isModule.toBoolean()) { implementation project(':module_main') @@ -82,3 +78,7 @@ dependencies { implementation project(':module_news') } } + +repositories { + google() +} diff --git a/module_girls/build.gradle b/module_girls/build.gradle index a1838bd..945dc59 100644 --- a/module_girls/build.gradle +++ b/module_girls/build.gradle @@ -5,25 +5,23 @@ if (isModule.toBoolean()) { } android { - compileSdkVersion build_versions.target_sdk + compileSdkVersion 27 defaultConfig { - minSdkVersion build_versions.min_sdk - targetSdkVersion build_versions.target_sdk + minSdkVersion min_sdk + targetSdkVersion target_sdk versionCode 1 versionName "1.0" javaCompileOptions { annotationProcessorOptions { - arguments = [ moduleName : project.getName() ] + arguments = [moduleName: project.getName()] } } } - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - sourceSets { main { if (isModule.toBoolean()) { @@ -37,7 +35,6 @@ android { } } } - buildTypes { release { minifyEnabled false @@ -47,7 +44,11 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - annotationProcessor deps.arouter_compiler + implementation fileTree(include: ['*.jar'], dir: 'libs') + annotationProcessor "com.alibaba:arouter-compiler:1.1.4" implementation project(':lib_common') } + +repositories { + google() +} diff --git a/module_main/build.gradle b/module_main/build.gradle index a1838bd..945dc59 100644 --- a/module_main/build.gradle +++ b/module_main/build.gradle @@ -5,25 +5,23 @@ if (isModule.toBoolean()) { } android { - compileSdkVersion build_versions.target_sdk + compileSdkVersion 27 defaultConfig { - minSdkVersion build_versions.min_sdk - targetSdkVersion build_versions.target_sdk + minSdkVersion min_sdk + targetSdkVersion target_sdk versionCode 1 versionName "1.0" javaCompileOptions { annotationProcessorOptions { - arguments = [ moduleName : project.getName() ] + arguments = [moduleName: project.getName()] } } } - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - sourceSets { main { if (isModule.toBoolean()) { @@ -37,7 +35,6 @@ android { } } } - buildTypes { release { minifyEnabled false @@ -47,7 +44,11 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - annotationProcessor deps.arouter_compiler + implementation fileTree(include: ['*.jar'], dir: 'libs') + annotationProcessor "com.alibaba:arouter-compiler:1.1.4" implementation project(':lib_common') } + +repositories { + google() +} diff --git a/module_news/build.gradle b/module_news/build.gradle index a1838bd..69255d6 100644 --- a/module_news/build.gradle +++ b/module_news/build.gradle @@ -5,10 +5,10 @@ if (isModule.toBoolean()) { } android { - compileSdkVersion build_versions.target_sdk + compileSdkVersion target_sdk defaultConfig { - minSdkVersion build_versions.min_sdk - targetSdkVersion build_versions.target_sdk + minSdkVersion min_sdk + targetSdkVersion target_sdk versionCode 1 versionName "1.0" @@ -48,6 +48,10 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - annotationProcessor deps.arouter_compiler + annotationProcessor "com.alibaba:arouter-compiler:1.1.4" implementation project(':lib_common') } + +repositories { + google() +} diff --git a/versions.gradle b/versions.gradle index 4a8a289..3e7764c 100644 --- a/versions.gradle +++ b/versions.gradle @@ -5,9 +5,9 @@ ext.deps = [:] def versions = [:] -versions.android_gradle_plugin = "3.0.1" -versions.kotlin = "1.1.51" -versions.support = "27.0.2" +versions.android_gradle_plugin = '3.3.1' +versions.kotlin = "1.3.0" +versions.support = "27.1.1" versions.multidex = "1.0.2" versions.constraint_layout = "1.0.2" versions.dagger = "2.11" @@ -35,7 +35,6 @@ versions.arouter_compiler = "1.1.4" versions.arouter_api = "1.3.1" - def deps = [:] def support = [:] @@ -69,7 +68,7 @@ deps.dagger = dagger def kotlin = [:] -kotlin.stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jre7:$versions.kotlin" +kotlin.stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin" kotlin.test = "org.jetbrains.kotlin:kotlin-test-junit:$versions.kotlin" kotlin.plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin" deps.kotlin = kotlin @@ -105,7 +104,7 @@ ext.deps = deps def build_versions = [:] build_versions.min_sdk = 16 build_versions.target_sdk = 27 -build_versions.build_tools = "27.0.2" +build_versions.build_tools = "27.0.3" ext.build_versions = build_versions