Skip to content

Commit f90e967

Browse files
update files
1 parent ede876f commit f90e967

4 files changed

Lines changed: 17 additions & 103 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ dependencies {
3535
compile(group: 'com.android.support', name: 'recyclerview-v7', version: supportLibVersion)
3636
compile 'com.xiaofeng.android:flowlayoutmanager:1.2.3.2'
3737
compile 'us.feras.mdv:markdownview:1.1.0'
38-
compile 'com.android.support:support-v4:23.3.0'
38+
compile 'com.android.support:support-v4:26.1.0'
3939
}

build.gradle

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.0'
9-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
10-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
11-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
12-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
9+
classpath 'com.android.tools.build:gradle:3.0.1'
10+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
11+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
12+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
13+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1314
// NOTE: Do not place your application dependencies here; they belong
1415
// in the individual module build.gradle files
1516
}
@@ -18,16 +19,17 @@ buildscript {
1819
allprojects {
1920
repositories {
2021
jcenter()
22+
google()
2123
}
2224
}
2325

2426
subprojects {
25-
ext.supportLibVersion = "23.3.0"
27+
ext.supportLibVersion = "26.1.0"
2628
ext.playServiceVersion = "8.4.0"
27-
ext.androidBuildToolVersion = "23.0.3";
28-
ext.androidCompileSdkVersion = 23
29+
ext.androidBuildToolVersion = "26.0.2"
30+
ext.androidCompileSdkVersion = 26
2931
ext.androidMinSdkVersion = 16
30-
ext.androidTargetSdkVersion = 23
32+
ext.androidTargetSdkVersion = 26
3133
}
3234

3335
task clean(type: Delete) {

flowlayoutmanager/build.gradle

Lines changed: 3 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// to publish run ./gradlew clean bintrayUpload
22

33
apply plugin: 'com.android.library'
4-
apply plugin: 'com.github.dcendents.android-maven'
54
apply plugin: 'com.jfrog.bintray'
65

76
project.ext {
@@ -28,7 +27,7 @@ android {
2827
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2928
}
3029
testOptions {
31-
unitTests.returnDefaultValues = false;
30+
unitTests.returnDefaultValues = false
3231
}
3332
buildTypes {
3433
release {
@@ -50,96 +49,9 @@ dependencies {
5049
androidTestCompile 'junit:junit:4.12'
5150
compile(group: 'com.android.support', name: 'appcompat-v7', version: supportLibVersion)
5251
compile(group: 'com.android.support', name: 'recyclerview-v7', version: supportLibVersion)
53-
androidTestCompile 'com.android.support:support-annotations:23.3.0'
54-
androidTestCompile 'com.android.support.test:runner:0.5'
52+
androidTestCompile 'com.android.support:support-annotations:26.1.0'
53+
androidTestCompile 'com.android.support.test:runner:1.0.1'
5554
}
5655

5756
Properties properties = new Properties()
5857
properties.load(project.rootProject.file('local.properties').newDataInputStream())
59-
60-
install {
61-
repositories.mavenInstaller {
62-
// This generates POM.xml with proper parameters
63-
pom {
64-
project {
65-
packaging 'aar'
66-
67-
// Add your description here
68-
name 'FlowLayoutManager for android RecyclerView'
69-
url siteUrl
70-
71-
// Set your license
72-
licenses {
73-
license {
74-
name 'GPL-v3.0'
75-
url 'http://www.gnu.org/licenses/gpl-3.0.en.html'
76-
}
77-
}
78-
developers {
79-
developer {
80-
id 'xiaofeng-han'
81-
name 'Xiaofeng Han'
82-
email 'hhhanxf@gmail.com'
83-
}
84-
}
85-
scm {
86-
connection gitUrl
87-
developerConnection gitUrl
88-
url gitUrl
89-
90-
}
91-
}
92-
}
93-
}
94-
}
95-
96-
task sourcesJar(type: Jar) {
97-
from android.sourceSets.main.java.srcDirs
98-
classifier = 'sources'
99-
}
100-
101-
task javadoc(type: Javadoc) {
102-
source = android.sourceSets.main.java.srcDirs
103-
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
104-
}
105-
106-
task javadocJar(type: Jar, dependsOn: javadoc) {
107-
classifier = 'javadoc'
108-
from javadoc.destinationDir
109-
}
110-
111-
112-
artifacts {
113-
archives sourcesJar
114-
archives javadocJar
115-
}
116-
117-
bintray {
118-
user = properties.getProperty('bintray.user')
119-
key = properties.getProperty('bintray.apikey')
120-
configurations = ['archives']
121-
pkg {
122-
repo = 'maven'
123-
name = 'FlowLayoutManager'
124-
userOrg = 'hhhanxf'
125-
licenses = ['GPL-3.0']
126-
vcsUrl = gitUrl
127-
githubRepo = 'xiaofeng-han/AndroidLibs'
128-
githubReleaseNotesFile = 'README.md'
129-
publish = true
130-
version {
131-
name = libVersion
132-
desc = 'FLowLayoutManager'
133-
released = new Date()
134-
vcsTag = libVersion
135-
gpg {
136-
sign = true
137-
passphrase = properties.getProperty('bintray.gpg.password')
138-
}
139-
}
140-
}
141-
}
142-
143-
task wrapper(type: Wrapper) {
144-
gradleVersion = '2.10'
145-
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Oct 21 11:34:03 PDT 2015
1+
#Sun Dec 31 17:41:08 CET 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 commit comments

Comments
 (0)