Skip to content

Commit 31f8e04

Browse files
mcsongmcsong
committed
빌드 스크립트 수정
1 parent 699c0a0 commit 31f8e04

File tree

11 files changed

+94
-267
lines changed

11 files changed

+94
-267
lines changed

‎.idea/encodings.xml‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo/Demo.iml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,15 @@
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8487
</content>
85-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
88+
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8689
<orderEntry type="sourceFolder" forTests="false" />
87-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
88-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
89-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
90+
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
91+
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
92+
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
9093
<orderEntry type="module" module-name="Library" exported="" />
9194
</component>
9295
</module>

‎Demo/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 21
5-
buildToolsVersion "21.1.2"
4+
compileSdkVersion 22
5+
buildToolsVersion "22.0.1"
66

77
defaultConfig {
88
applicationId "net.sjava.appstore.demo"
99
minSdkVersion 8
10-
targetSdkVersion 21
10+
targetSdkVersion 22
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -22,5 +22,5 @@ android {
2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
compile project(':Library')
25-
compile 'com.android.support:appcompat-v7:21.0.3'
25+
compile 'com.android.support:appcompat-v7:22.0.0'
2626
}

‎Library/Library.iml‎

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
</facet>
99
<facet type="android" name="Android">
1010
<configuration>
11-
<option name="SELECTED_BUILD_VARIANT" value="debug" />
11+
<option name="SELECTED_BUILD_VARIANT" value="release" />
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13-
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
15+
<option name="SOURCE_GEN_TASK_NAME" value="generateReleaseSources" />
1816
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1917
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2018
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -25,29 +23,23 @@
2523
</facet>
2624
</component>
2725
<component name="NewModuleRootManager" inherit-compiler-output="false">
28-
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
26+
<output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
2927
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
3028
<exclude-output />
3129
<content url="file://$MODULE_DIR$">
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36-
<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" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42-
<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" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
46-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
47-
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/release" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
5143
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5244
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5345
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -82,16 +74,14 @@
8274
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8375
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8476
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8677
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
8878
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8979
</content>
90-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
80+
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
9181
<orderEntry type="sourceFolder" forTests="false" />
92-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
93-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
94-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
82+
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
83+
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
84+
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
9585
</component>
9686
</module>
9787

‎Library/build.gradle‎

Lines changed: 7 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,18 @@
1-
/*
2-
buildscript {
3-
repositories {
4-
jcenter()
5-
}
6-
7-
dependencies {
8-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
9-
//classpath 'com.github.dcendents:android-maven-plugin:1.2'
10-
}
11-
}
12-
*/
13-
14-
//import java.text.SimpleDateFormat
15-
16-
//def globalVersion = new Version(currentVersion)
17-
18-
def group = 'net.sjava.appstore'
19-
def version = '1.0.0'
20-
211
apply plugin: 'com.android.library'
22-
apply plugin: 'com.github.dcendents.android-maven'
23-
apply plugin: 'com.jfrog.bintray'
242

25-
// This is the library version used when deploying the artifact
26-
version = "1.0.0"
273

284
android {
29-
compileSdkVersion 21
30-
buildToolsVersion "21.1.2"
31-
32-
/*
33-
sourceSets {
34-
main {
35-
manifest.srcFile '/src/main/AndroidManifest.xml'
36-
java.srcDirs = ['src']
37-
38-
resources.srcDirs = ['src']
39-
aidl.srcDirs = ['src']
5+
compileSdkVersion 22
6+
buildToolsVersion "22.0.1"
407

41-
renderscript.srcDirs = ['src']
42-
43-
res.srcDirs = ['res']
44-
assets.srcDirs = ['assets']
45-
}
46-
}
47-
*/
488

499
defaultConfig {
5010
minSdkVersion 8
51-
targetSdkVersion 21
11+
targetSdkVersion 22
5212
versionCode 1
53-
versionName "1.0"
13+
versionName "1.0.0"
5414
}
15+
5516
buildTypes {
5617
release {
5718
minifyEnabled false
@@ -62,137 +23,7 @@ android {
6223

6324
dependencies {
6425
compile fileTree(dir: 'libs', include: ['*.jar'])
65-
compile 'com.android.support:appcompat-v7:21.0.3'
66-
}
67-
68-
def siteUrl = 'https://github.com/mcsong/AppStoreLibrary' // Homepage URL of the library
69-
def gitUrl = 'https://github.com/mcsong/AppStoreLibrary.git' // Git repository URL
70-
71-
Properties properties = new Properties()
72-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
73-
74-
def bintray_user = properties.getProperty("bintray.user")
75-
def bintray_api_key = properties.getProperty("bintray.apikey")
76-
77-
bintray {
78-
user = bintray_user
79-
key = bintray_api_key
80-
81-
configurations = ['archives'] //When uploading configuration files
82-
pkg {
83-
repo = 'maven'
84-
name = 'AppStoreLibrary'
85-
desc = 'This is a library with some AppStore features'
86-
websiteUrl = siteUrl
87-
issueTrackerUrl = 'https://github.com/mcsong/AppStoreLibrary/issues'
88-
vcsUrl = gitUrl
89-
licenses = ['Apache-2.0']
90-
labels = ['aar', 'android', 'appstore']
91-
publicDownloadNumbers = true
92-
}
26+
compile 'com.android.support:appcompat-v7:22.0.0'
9327
}
9428

95-
group ='net.sjava.appstore'
96-
97-
install {
98-
repositories.mavenInstaller {
99-
pom {
100-
project {
101-
packaging 'aar'
102-
name 'AppStoreLibrary'
103-
url siteUrl
104-
licenses {
105-
license {
106-
name 'The Apache Software License, Version 2.0'
107-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
108-
}
109-
}
110-
developers {
111-
developer {
112-
id 'mcsong'
113-
name 'Justin(Moo Chan) Song'
114-
email 'mcsong@gmail.com'
115-
}
116-
}
117-
scm {
118-
connection gitUrl
119-
developerConnection gitUrl
120-
url siteUrl
121-
}
122-
}
123-
}
124-
}
125-
}
126-
127-
128-
task sourcesJar(type: Jar) {
129-
from android.sourceSets.main.java.srcDirs
130-
classifier = 'sources'
131-
}
132-
133-
task javadoc(type: Javadoc) {
134-
options.charSet = 'UTF-8'
135-
source = android.sourceSets.main.java.srcDirs
136-
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
137-
}
138-
139-
task javadocJar(type: Jar, dependsOn: javadoc) {
140-
classifier = 'javadoc'
141-
from javadoc.destinationDir
142-
}
143-
144-
artifacts {
145-
archives javadocJar
146-
archives sourcesJar
147-
}
148-
149-
150-
/*
151-
Properties properties = new Properties()
152-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
153-
154-
bintray {
155-
user = properties.getProperty("bintray.user")
156-
key = properties.getProperty("bintray.apikey")
157-
158-
configurations = ['archives']
159-
pkg {
160-
repo = "maven"
161-
name = "net.sjava.appstore"
162-
websiteUrl = siteUrl
163-
vcsUrl = gitUrl
164-
licenses = ["Apache-2.0"]
165-
publish = true
166-
}
167-
}
168-
169-
class Version {
170-
String originalVersion
171-
String thisVersion
172-
String status
173-
Date buildTime
174-
175-
Version(String versionValue) {
176-
buildTime = new Date()
177-
originalVersion = versionValue
178-
if (originalVersion.endsWith('-SNAPSHOT')) {
179-
status = 'integration'
180-
thisVersion = originalVersion.substring(0, originalVersion.length() - 'SNAPSHOT'.length()) + getTimestamp()
181-
} else {
182-
status = 'release'
183-
thisVersion = versionValue
184-
}
185-
}
186-
187-
String getTimestamp() {
188-
// Convert local file timestamp to UTC
189-
def format = new SimpleDateFormat('yyyyMMddHHmmss')
190-
format.setCalendar(Calendar.getInstance(TimeZone.getTimeZone('UTC')));
191-
return format.format(buildTime)
192-
}
193-
194-
String toString() {
195-
thisVersion
196-
}
197-
}
198-
*/
29+
apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'

0 commit comments

Comments
 (0)