Skip to content

Commit

Permalink
Merge pull request #31 from ProtonProtocol/develop
Browse files Browse the repository at this point in the history
Simplified Build Process
  • Loading branch information
Joey Harward authored Apr 29, 2021
2 parents 73772a2 + 1ff02b6 commit 9fc2923
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 23 deletions.
13 changes: 1 addition & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,6 @@ allprojects {
password = properties.getProperty('github.token')
}
}
// this is needed for ESR library access
maven {
name = "ESRSdk"
url = uri("https://maven.pkg.github.com/ProtonProtocol/eosio-signing-request-java")
credentials {
...
username = properties.getProperty('github.username')
password = properties.getProperty('github.token')
}
}
}
}
```
Expand All @@ -50,7 +39,7 @@ Then add the following dependency to your module's build.gradle
```gradle
dependencies {
...
implementation "com.metallicus:protonsdk:1.0.0"
implementation "com.metallicus:protonsdk:1.0.1"
}
```

Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ allprojects {

google()
mavenCentral()
jcenter()
jcenter() // for orchid

maven {
name = "eosio-signing-request-java"
url = uri("https://maven.pkg.github.com/ProtonProtocol/eosio-signing-request-java")
name = "ProtonKotlinSdk"
url = uri("https://maven.pkg.github.com/ProtonProtocol/ProtonKotlin")
credentials {
username = gradleLocalProperties(rootDir).getProperty("github.username")
password = gradleLocalProperties(rootDir).getProperty("github.token")
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const val orchidVersion = "0.21.1"

object ProtonSdk {
const val versionCode = 40
const val versionName = "1.0.0"
const val versionName = "1.0.1"
}

object BuildPlugins {
Expand Down Expand Up @@ -69,7 +69,7 @@ object Libraries {
const val timber = "4.7.1"
const val gson = "2.8.6"
const val guava = "30.1.1-jre"
const val esr = "1.0.4"
const val esr = "1.0.0"
}

const val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
Expand All @@ -95,7 +95,7 @@ object Libraries {
const val orchidKotlindoc = "io.github.javaeden.orchid:OrchidKotlindoc:$orchidVersion"
const val orchidPluginDocs = "io.github.javaeden.orchid:OrchidPluginDocs:$orchidVersion"
const val orchidGithub = "io.github.javaeden.orchid:OrchidGithub:$orchidVersion"
const val greymassESR = "com.greymass:esrsdk:${Versions.esr}"
const val greymassESR = "com.metallicus:esrsdk:${Versions.esr}"
}

object TestLibraries {
Expand Down
10 changes: 5 additions & 5 deletions protonsdk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ tasks {
}
}

// // publishing depends on build
// withType<PublishToMavenLocal> {
// dependsOn(build)
// }
//
// publishing depends on build
withType<PublishToMavenLocal> {
dependsOn(build)
}

// // uploading to Bintray depends on publications
// withType<BintrayUploadTask> {
// dependsOn(publishToMavenLocal)
Expand Down

0 comments on commit 9fc2923

Please sign in to comment.