Skip to content

Commit

Permalink
Merge pull request #35 from skedgo/thuy/release-v1.1b1
Browse files Browse the repository at this point in the history
Release TripKit v1.1b1
  • Loading branch information
Thuy Trinh committed Mar 18, 2016
2 parents dcbd1e9 + 417e5b3 commit 97307b4
Show file tree
Hide file tree
Showing 26 changed files with 82 additions and 24 deletions.
2 changes: 1 addition & 1 deletion samples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.facebook.stetho:stetho:1.2.0'
compile 'com.facebook.stetho:stetho-okhttp:1.2.0'
compile('com.skedgo.sdk:trip-kit:1.0@aar') {
compile('com.skedgo.sdk:trip-kit:1.1b1@aar') {
transitive = true
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
47d2b61603d927e5b025a95014cec437
cea46103595296db1d092f501ebc75da
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0959c89b260befaf0a3701f7729dae5242a87f68
52b40cc6229f3956bcbc2988e3b4d380c67a9acd
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
<version>0.24.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.skedgo.goservices</groupId>
<artifactId>transport-icons</artifactId>
<version>0.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.android.support</groupId>
<artifactId>support-annotations</artifactId>
Expand All @@ -49,6 +43,12 @@
<version>2.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.skedgo.goservices</groupId>
<artifactId>transport-icons</artifactId>
<version>0.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.skedgo.android</groupId>
<artifactId>maps-utils</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
880a8f516b3a71bedbcd5f7e48ddf0c4
7860ce7d6e4b08b1f4db7d079faeffc0
Original file line number Diff line number Diff line change
@@ -1 +1 @@
94994a2aea7da3bd15404818a297ce6f3ce294f7
39f8f7367197db51c0d145cd3dd5567d232a9698
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>0.0.1</version>
</versions>
<lastUpdated>20160311123645</lastUpdated>
<lastUpdated>20160318113557</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6aeadf686ef66517b5f0552030639404
303cec018985fafe99dc9e4e05b45309
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2207a3ca5534ca4cb81d89dfb401e20a02376762
bd0a9828dd059819c63e9362b965d7426d6de483
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8f9a382d6e1c4f34d9baa25e429bdbe4
ce534c52a1902036220abf91e0defd92
Original file line number Diff line number Diff line change
@@ -1 +1 @@
98cbde6c8f636e05493e909d4cc686cefeaaea5f
e317325db8a1a3b950570a140c6caf165c89ab97
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>0.0.1</version>
</versions>
<lastUpdated>20160311123645</lastUpdated>
<lastUpdated>20160318113553</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cb0d6a58cb2e1e452c024f4d93fabf2e
2107e6d39c8f71036f1d5e7c00e83418
Original file line number Diff line number Diff line change
@@ -1 +1 @@
553417317fe85b9654a40da676981415b40a2be2
1d0e21dd65b915c21a18f4c84bbf51560d5c804b
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
294d3c6bf59a5f3dfa3cbd09eed8bc62
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
63f24c6857a0d7738c1e381c791efb164dcbbb52
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.skedgo.sdk</groupId>
<artifactId>trip-kit</artifactId>
<version>1.1b1</version>
<packaging>aar</packaging>
<dependencies>
<dependency>
<groupId>com.google.android.gms</groupId>
<artifactId>play-services-gcm</artifactId>
<version>8.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>converter-gson</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>adapter-rxjava</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.skedgo.goservices</groupId>
<artifactId>android-shared-lib</artifactId>
<version>0.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>3.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>retrofit</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f83e5b299d7a7585b1aa4aeda1d82947
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec7e9a79fd7c0b4bcf9ce5e7f5ca007ab3cf3d6f
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>com.skedgo.sdk</groupId>
<artifactId>trip-kit</artifactId>
<versioning>
<release>1.0</release>
<release>1.1b1</release>
<versions>
<version>0.9-SNAPSHOT</version>
<version>1.0-beta1</version>
Expand All @@ -15,7 +15,8 @@
<version>1.0-rc5</version>
<version>1.0-rc6</version>
<version>1.0</version>
<version>1.1b1</version>
</versions>
<lastUpdated>20160311123646</lastUpdated>
<lastUpdated>20160318113608</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e3dad4bef4fd9fddba9983baa7721dc1
dc70939bc6cc8997b6f2ec5e31d92c2c
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5831e015aca4f1402ee1250c6c466d9ccd5f6db9
5fa39cfae14a2ad9c38680acf9179288ae09b3fe
2 changes: 1 addition & 1 deletion trip-kit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: "com.github.dcendents.android-maven"
apply plugin: 'com.neenbedankt.android-apt'

group = "com.skedgo.sdk"
version = "1.0"
version = "1.1b1"

android {
compileSdkVersion rootProject.ext.CompileSdkVersion
Expand Down

0 comments on commit 97307b4

Please sign in to comment.