Skip to content

唐文 / AiyoZhuaWaWa

Go to a project
Commit 6d5d8423 by 潘宗杰
Options

重新清理IDE相关

parent 136a3037
Inline Side-by-side
Showing with 15 additions and 10 deletions
.idea/gradle.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="distributionType" value="LOCAL" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="E:/Setting/Android/gradle-version/gradle/gradle-2.14.1-all/gradle-2.14.1" /> <option name="gradleHome" value="E:/Setting/Android/gradle-version/gradle/gradle-2.14.1-all/gradle-2.14.1" />
<option name="modules"> <option name="modules">
......
.idea/modules.xml
...@@ -3,9 +3,12 @@ ...@@ -3,9 +3,12 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/AiyoZhuaWaWa.iml" filepath="$PROJECT_DIR$/AiyoZhuaWaWa.iml" /> <module fileurl="file://$PROJECT_DIR$/AiyoZhuaWaWa.iml" filepath="$PROJECT_DIR$/AiyoZhuaWaWa.iml" />
<module fileurl="file://D:\WorkSpace\AndroidStudio\AiyoZhuaWaWa\AiyoZhuaWaWa.iml" filepath="D:\WorkSpace\AndroidStudio\AiyoZhuaWaWa\AiyoZhuaWaWa.iml" />
<module fileurl="file://G:\Product\Android\DuoBaoJingCai\DuoBaoJingCai2.iml" filepath="G:\Product\Android\DuoBaoJingCai\DuoBaoJingCai2.iml" /> <module fileurl="file://G:\Product\Android\DuoBaoJingCai\DuoBaoJingCai2.iml" filepath="G:\Product\Android\DuoBaoJingCai\DuoBaoJingCai2.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://D:\WorkSpace\AndroidStudio\AiyoZhuaWaWa\app\app.iml" filepath="D:\WorkSpace\AndroidStudio\AiyoZhuaWaWa\app\app.iml" />
<module fileurl="file://$PROJECT_DIR$/multi-image-selector/multi-image-selector.iml" filepath="$PROJECT_DIR$/multi-image-selector/multi-image-selector.iml" /> <module fileurl="file://$PROJECT_DIR$/multi-image-selector/multi-image-selector.iml" filepath="$PROJECT_DIR$/multi-image-selector/multi-image-selector.iml" />
<module fileurl="file://D:\WorkSpace\AndroidStudio\AiyoZhuaWaWa\multi-image-selector\multi-image-selector.iml" filepath="D:\WorkSpace\AndroidStudio\AiyoZhuaWaWa\multi-image-selector\multi-image-selector.iml" />
</modules> </modules>
</component> </component>
</project> </project>
\ No newline at end of file
app/build.gradle
...@@ -118,7 +118,7 @@ android { ...@@ -118,7 +118,7 @@ android {
if ("false".equals(is_jenkins)) { if ("false".equals(is_jenkins)) {
//groovy boolean 如果你把一个对象放在一个boolean表达式中,Groovy 会检查这个对象是否为null. 它会把null当做false,否则为true //groovy boolean 如果你把一个对象放在一个boolean表达式中,Groovy 会检查这个对象是否为null. 它会把null当做false,否则为true
fileName = "${projectNameLowerCase}_${channelName}_v${defaultConfig.versionName}${suffixName[networkType]}.apk" fileName = "${projectNameLowerCase}_${channelName}_v${defaultConfig.versionName}${suffixName[networkType]}.apk"
outputFile = "G:/Apks/${projectName}" outputFile = "D:/Apks/${projectName}"
} else { } else {
channelName = PRODUCT_FLAAVOR_BUILD channelName = PRODUCT_FLAAVOR_BUILD
//outputFile = "/vagrant/jenkins/jenkins-workspace/walleApps/${projectName}" //outputFile = "/vagrant/jenkins/jenkins-workspace/walleApps/${projectName}"
...@@ -167,6 +167,7 @@ android { ...@@ -167,6 +167,7 @@ android {
//权限申请 //权限申请
compile 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.3@aar' compile 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.3@aar'
} }
buildToolsVersion '26.0.2'
} }
task hello1 << { task hello1 << {
println 'hello1' + "app.build.gradle" println 'hello1' + "app.build.gradle"
...@@ -188,11 +189,11 @@ task count << { ...@@ -188,11 +189,11 @@ task count << {
* gradlew assembleRelease jiagubao_walle * gradlew assembleRelease jiagubao_walle
* 一键实现多渠道打包 * 一键实现多渠道打包
*/ */
def BASE_LOCAL = "G:/Apks/" def BASE_LOCAL = "D:/Apks/"
def BUILD_TOOLS = "/build-tools/25.0.2" def BUILD_TOOLS = "/build-tools/25.0.1"
def SDK_PATH_COMPONENY = "C:/Users/Administrator/AppData/Local/Android/Sdk" def SDK_PATH_COMPONENY = "D:/AndroidSDK"
def SDK_PATH_COMPONENY_BUILDTOOLS = SDK_PATH_COMPONENY + BUILD_TOOLS def SDK_PATH_COMPONENY_BUILDTOOLS = SDK_PATH_COMPONENY + BUILD_TOOLS
def SDK_PATH_HOME = "C:/Users/Administrator/AppData/Local/Android/Sdk" def SDK_PATH_HOME = "D:/AndroidSDK"
def SDK_PATH_HOME_BUILDTOOLS = SDK_PATH_HOME + BUILD_TOOLS def SDK_PATH_HOME_BUILDTOOLS = SDK_PATH_HOME + BUILD_TOOLS
def apkName = "${projectNameLowerCase}_baseflavor_v${APP_VERSION}${suffixName[networkType]}" //基础包 def apkName = "${projectNameLowerCase}_baseflavor_v${APP_VERSION}${suffixName[networkType]}" //基础包
def apkBasePath = BASE_LOCAL + projectName + "/" def apkBasePath = BASE_LOCAL + projectName + "/"
......
build.gradle
...@@ -5,7 +5,7 @@ buildscript { ...@@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.meituan.android.walle:plugin:1.1.5' //walle classpath 'com.meituan.android.walle:plugin:1.1.5' //walle
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
......
gradle/wrapper/gradle-wrapper.properties
#Fri Nov 10 16:23:30 CST 2017 #Wed Apr 11 15:43:55 CST 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
#distributionUrl=file:///E:/Setting/Android/gradle-version/gradle/gradle-2.14.1-all.zip
multi-image-selector/build.gradle
...@@ -27,6 +27,7 @@ android { ...@@ -27,6 +27,7 @@ android {
} }
resourcePrefix "mis_" resourcePrefix "mis_"
buildToolsVersion '26.0.2'
} }
dependencies { dependencies {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment