Skip to content

Commit a06adf0

Browse files
mcsongmcsong
committed
Updates build and deploy scripts.
1 parent 198d8de commit a06adf0

File tree

10 files changed

+142
-44
lines changed

10 files changed

+142
-44
lines changed

‎.idea/encodings.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo/Demo.iml‎

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
18-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2120
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,74 +23,91 @@
2423
</configuration>
2524
</facet>
2625
</component>
27-
<component name="NewModuleRootManager" inherit-compiler-output="false">
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2827
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
30-
<exclude-output />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3129
<content url="file://$MODULE_DIR$">
3230
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3331
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3432
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3533
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3634
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3836
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3937
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4139
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4240
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4442
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4543
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4644
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4745
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4846
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4947
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5048
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5158
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5259
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5360
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5461
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5562
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5663
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5764
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
5874
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5975
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6076
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6177
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6278
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6379
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6480
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
6582
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6684
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
6986
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7287
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7691
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7792
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
7993
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8194
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8295
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
8397
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8499
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85100
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
86101
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
87102
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
88103
</content>
89-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
104+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
90105
<orderEntry type="sourceFolder" forTests="false" />
91-
<orderEntry type="library" exported="" name="library-1.0.1" level="project" />
92-
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
93-
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
94-
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
106+
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
107+
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
108+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
109+
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
110+
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
95111
<orderEntry type="module" module-name="Library" exported="" />
96112
</component>
97113
</module>

‎Demo/build.gradle‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ buildscript {
99
*/
1010

1111
android {
12-
compileSdkVersion 22
13-
buildToolsVersion "22.0.1"
12+
compileSdkVersion 23
13+
buildToolsVersion "23.0.3"
1414

1515
defaultConfig {
1616
applicationId "net.sjava.appstore.demo"
1717
minSdkVersion 8
18-
targetSdkVersion 22
18+
targetSdkVersion 23
1919
versionCode 1
2020
versionName "1.0"
2121
}
@@ -25,12 +25,16 @@ android {
2525
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2626
}
2727
}
28+
29+
lintOptions {
30+
abortOnError false
31+
}
2832
}
2933

3034
dependencies {
3135
compile fileTree(dir: 'libs', include: ['*.jar'])
3236
compile project(':Library')
33-
compile 'com.android.support:appcompat-v7:22.0.0'
37+
compile 'com.android.support:appcompat-v7:23.4.0'
3438
//compile 'net.sjava.appstore:library:1.0.0-SNAPSHOT'
35-
compile 'net.sjava.appstore:library:1.0.1@aar'
39+
//compile 'net.sjava.appstore:library:1.0.1@aar'
3640
}

‎Library/Library.iml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,25 +87,30 @@
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
9294
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9395
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9496
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9597
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
9798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
99100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
100101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
101102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
102103
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
103106
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
104107
</content>
105-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
108+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
106109
<orderEntry type="sourceFolder" forTests="false" />
107-
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
108-
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
109-
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
110+
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
111+
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
112+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
113+
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
114+
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
110115
</component>
111116
</module>

‎Library/build.gradle‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,36 @@
11
apply plugin: 'com.android.library'
2+
apply plugin: 'com.novoda.bintray-release'
23

4+
publish {
5+
userOrg = 'mcsong'
6+
groupId = 'net.sjava'
7+
artifactId = 'appstore'
8+
publishVersion = '1.0.2'
9+
desc = 'Android AppStore Library'
10+
website = 'https://github.com/mcsong/AppStoreLibrary'
11+
issueTracker = "${website}/issues"
12+
repository = "${website}.git"
13+
}
14+
15+
buildscript {
16+
repositories {
17+
jcenter()
18+
}
19+
dependencies {
20+
classpath 'com.novoda:bintray-release:0.3.4'
21+
}
22+
}
323

424
android {
5-
compileSdkVersion 22
6-
buildToolsVersion "22.0.1"
25+
compileSdkVersion 23
26+
buildToolsVersion "23.0.3"
727

828

929
defaultConfig {
1030
minSdkVersion 8
11-
targetSdkVersion 22
31+
targetSdkVersion 23
1232
versionCode 1
13-
versionName "1.0.0"
33+
versionName "1.0.2"
1434
}
1535

1636
buildTypes {
@@ -19,9 +39,13 @@ android {
1939
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2040
}
2141
}
42+
43+
lintOptions {
44+
abortOnError false
45+
}
2246
}
2347

2448
dependencies {
2549
compile fileTree(dir: 'libs', include: ['*.jar'])
26-
compile 'com.android.support:appcompat-v7:22.0.0'
50+
compile 'com.android.support:appcompat-v7:23.4.0'
2751
}

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ This library make easy to use AppStore app' features.
1717
Gradle
1818
```groovy
1919
dependencies {
20-
compile 'net.sjava.appstore:library:1.0.1@aar'
20+
compile 'net.sjava:appstore:1.0.2'
2121
}
2222
```
2323

2424
Maven
2525
```xml
2626
<dependency>
27-
<groupId>net.sjava.appstore</groupId>
28-
<artifactId>library</artifactId>
29-
<version>1.0.1</version>
27+
<groupId>net.sjava</groupId>
28+
<artifactId>appstore</artifactId>
29+
<version>1.0.2</version>
3030
</dependency>
3131
```
3232
## Usage

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
1212
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13-
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
13+
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1414

1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit

0 commit comments

Comments
 (0)