erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Remote Retrofit 1.9.

Browse source
This commit is contained in:
Cedric Beust 2016-03-11 23:16:44 +04:00
parent 27a613c8bb
commit 7798fb02b9
6 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/libraries/kobalt__Compile_.xml generated
View file

@ -5,8 +5,6 @@
<root url="jar://$USER_HOME$/.kobalt/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit/retrofit/1.9.0/retrofit-1.9.0.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model/3.3.3/maven-model-3.3.3.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model/3.3.3/maven-model-3.3.3.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" />

3
.idea/libraries/kobalt_plugin_api__Compile_.xml generated
View file

@ -7,8 +7,6 @@
<root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/retrofit/2.0.0-beta4/retrofit-2.0.0-beta4.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/retrofit/2.0.0-beta4/retrofit-2.0.0-beta4.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit/retrofit/1.9.0/retrofit-1.9.0.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model/3.3.3/maven-model-3.3.3.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model/3.3.3/maven-model-3.3.3.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/io/reactivex/rxjava/1.0.16/rxjava-1.0.16.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/io/reactivex/rxjava/1.0.16/rxjava-1.0.16.jar!/" />
@ -17,6 +15,7 @@
<root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/20.0-SNAPSHOT/guava-20.0-SNAPSHOT.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/20.0-SNAPSHOT/guava-20.0-SNAPSHOT.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/guice/4.0/guice-4.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/guice/4.0/guice-4.0.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

3
kobalt/src/Build.kt
View file

@ -62,7 +62,6 @@ val kobaltPluginApi = project {
dependencies { dependencies {
compile("org.jetbrains.kotlinx:kotlinx.dom:0.0.9", compile("org.jetbrains.kotlinx:kotlinx.dom:0.0.9",
"com.squareup.okio:okio:1.6.0",
"com.google.inject:guice:4.0", "com.google.inject:guice:4.0",
"com.google.inject.extensions:guice-assistedinject:4.0", "com.google.inject.extensions:guice-assistedinject:4.0",
"javax.inject:javax.inject:1", "javax.inject:javax.inject:1",
@ -70,8 +69,8 @@ val kobaltPluginApi = project {
"org.apache.maven:maven-model:3.3.3", "org.apache.maven:maven-model:3.3.3",
"io.reactivex:rxjava:1.0.16", "io.reactivex:rxjava:1.0.16",
"com.google.code.gson:gson:2.4", "com.google.code.gson:gson:2.4",
"com.squareup.okio:okio:1.6.0",
"com.squareup.okhttp3:okhttp:3.2.0", "com.squareup.okhttp3:okhttp:3.2.0",
"com.squareup.retrofit:retrofit:1.9.0",
"com.squareup.retrofit2:retrofit:2.0.0-beta4", "com.squareup.retrofit2:retrofit:2.0.0-beta4",
"com.squareup.retrofit2:converter-gson:2.0.0-beta4", "com.squareup.retrofit2:converter-gson:2.0.0-beta4",
"com.beust:jcommander:1.48" "com.beust:jcommander:1.48"

10
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Http.kt
View file

@ -4,12 +4,14 @@ import com.beust.kobalt.KobaltException
import com.beust.kobalt.misc.CountingFileRequestBody import com.beust.kobalt.misc.CountingFileRequestBody
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import okhttp3.* import okhttp3.*
import retrofit.mime.TypedFile import java.io.File
import java.io.IOException import java.io.IOException
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton
class Http { class Http {
class TypedFile(val mimeType: String, val file: File)
fun get(user: String?, password: String?, url: String) : Response { fun get(user: String?, password: String?, url: String) : Response {
val client = OkHttpClient() val client = OkHttpClient()
val request = Request.Builder().url(url) val request = Request.Builder().url(url)
@ -47,7 +49,7 @@ class Http {
error: (Response) -> Unit = DEFAULT_ERROR_RESPONSE) { error: (Response) -> Unit = DEFAULT_ERROR_RESPONSE) {
val fullHeaders = Headers.Builder() val fullHeaders = Headers.Builder()
fullHeaders.set("Content-Type", file.mimeType()) fullHeaders.set("Content-Type", file.mimeType)
headers.names().forEach { fullHeaders.set(it, headers.get(it)) } headers.names().forEach { fullHeaders.set(it, headers.get(it)) }
user?.let { user?.let {
@ -59,9 +61,9 @@ class Http {
.url(url) .url(url)
val request = val request =
(if (post) (if (post)
requestBuilder.post(CountingFileRequestBody(file.file(), file.mimeType(), progressCallback)) requestBuilder.post(CountingFileRequestBody(file.file, file.mimeType, progressCallback))
else else
requestBuilder.put(CountingFileRequestBody(file.file(), file.mimeType(), progressCallback))) requestBuilder.put(CountingFileRequestBody(file.file, file.mimeType, progressCallback)))
.build() .build()
log(2, "Uploading $file to $url") log(2, "Uploading $file to $url")

14
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/GithubApi2.kt
View file

@ -5,8 +5,6 @@ import com.beust.kobalt.internal.DocUrl
import com.beust.kobalt.maven.Http import com.beust.kobalt.maven.Http
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.google.inject.Inject import com.google.inject.Inject
import retrofit.RetrofitError
import retrofit.mime.TypedFile
import retrofit2.Call import retrofit2.Call
import retrofit2.Retrofit import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory import retrofit2.converter.gson.GsonConverterFactory
@ -73,13 +71,13 @@ class GithubApi2 @Inject constructor(
.execute() .execute()
.body() .body()
uploadAsset(accessToken, response.uploadUrl!!, TypedFile("application/zip", zipFile), uploadAsset(accessToken, response.uploadUrl!!, Http.TypedFile("application/zip", zipFile),
tagName) tagName)
.toBlocking() .toBlocking()
.forEach { action -> .forEach { action ->
log(1, "\n${zipFile.name} successfully uploaded") log(1, "\n${zipFile.name} successfully uploaded")
} }
} catch(e: RetrofitError) { } catch(e: Exception) {
throw KobaltException("Couldn't upload release: " + e.message, e) throw KobaltException("Couldn't upload release: " + e.message, e)
// val error = parseRetrofitError(e) // val error = parseRetrofitError(e)
// throw KobaltException("Couldn't upload release, ${error.message}: " // throw KobaltException("Couldn't upload release, ${error.message}: "
@ -87,13 +85,13 @@ class GithubApi2 @Inject constructor(
} }
} }
private fun uploadAsset(token: String, uploadUrl: String, typedFile: TypedFile, tagName: String) private fun uploadAsset(token: String, uploadUrl: String, typedFile: Http.TypedFile, tagName: String)
: Observable<UploadAssetResponse> { : Observable<UploadAssetResponse> {
val strippedUrl = uploadUrl.substring(0, uploadUrl.indexOf("{")) val strippedUrl = uploadUrl.substring(0, uploadUrl.indexOf("{"))
val fileName = typedFile.file().name val fileName = typedFile.file.name
val url = "$strippedUrl?name=$fileName&label=$fileName" val url = "$strippedUrl?name=$fileName&label=$fileName"
val headers = okhttp3.Headers.of("Authorization", "token $token") val headers = okhttp3.Headers.of("Authorization", "token $token")
val totalSize = typedFile.file().length() val totalSize = typedFile.file.length()
http.uploadFile(url = url, file = typedFile, headers = headers, post = true, // Github requires POST http.uploadFile(url = url, file = typedFile, headers = headers, post = true, // Github requires POST
progressCallback = http.percentProgressCallback(totalSize)) progressCallback = http.percentProgressCallback(totalSize))
@ -123,7 +121,7 @@ class GithubApi2 @Inject constructor(
throw KobaltException("Couldn't find the latest release") throw KobaltException("Couldn't find the latest release")
} }
} }
} catch(e: RetrofitError) { } catch(e: Exception) {
log(1, "Couldn't retrieve releases from github: " + e.message) log(1, "Couldn't retrieve releases from github: " + e.message)
e.printStackTrace() e.printStackTrace()
// val error = parseRetrofitError(e) // val error = parseRetrofitError(e)

3
src/main/kotlin/com/beust/kobalt/plugin/publish/BintrayApi.kt
View file

@ -15,7 +15,6 @@ import com.google.gson.JsonObject
import com.google.gson.JsonParser import com.google.gson.JsonParser
import com.google.inject.assistedinject.Assisted import com.google.inject.assistedinject.Assisted
import okhttp3.Response import okhttp3.Response
import retrofit.mime.TypedFile
import java.io.File import java.io.File
import javax.annotation.Nullable import javax.annotation.Nullable
import javax.inject.Inject import javax.inject.Inject
@ -153,7 +152,7 @@ class BintrayApi @Inject constructor (
val results = arrayListOf<Boolean>() val results = arrayListOf<Boolean>()
filesToUpload.forEach { file -> filesToUpload.forEach { file ->
http.uploadFile(username, password, fileToPath(file) + optionPath, http.uploadFile(username, password, fileToPath(file) + optionPath,
TypedFile(MediaType.ANY_APPLICATION_TYPE.toString(), file), Http.TypedFile(MediaType.ANY_APPLICATION_TYPE.toString(), file),
post = false, // Bintray requires PUT post = false, // Bintray requires PUT
success = { r: Response -> results.add(true) }, success = { r: Response -> results.add(true) },
error = { r: Response -> error = { r: Response ->