Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ballerina/oauth2 module for Swan Lake Design #45

Merged
merged 10 commits into from
Jan 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,13 @@ plugins {
}

ext.ballerinaLangVersion = project.ballerinaLangVersion
ext.stdlibAuthVersion = project.stdlibAuthVersion
ext.stdlibCacheVersion = project.stdlibCacheVersion
ext.stdlibCryptoVersion = project.stdlibCryptoVersion
ext.stdlibLogVersion = project.stdlibLogVersion
ext.stdlibStringUtilsVersion = project.stdlibStringUtilsVersion
ext.stdlibTimeVersion = project.stdlibTimeVersion
// Transitive dependencies
ext.stdlibConfigVersion = project.stdlibConfigVersion
ext.stdlibIoVersion = project.stdlibIoVersion
ext.stdlibRuntimeVersion = project.stdlibRuntimeVersion
ext.stdlibSystemVersion = project.stdlibSystemVersion
ext.stdlibTaskVersion = project.stdlibTaskVersion

allprojects {
Expand Down Expand Up @@ -62,13 +58,6 @@ allprojects {
password System.getenv("packagePAT")
}
}
maven {
url = 'https://maven.pkg.github.com/ballerina-platform/module-ballerina-auth'
credentials {
username System.getenv("packageUser")
password System.getenv("packagePAT")
}
}
maven {
url = 'https://maven.pkg.github.com/ballerina-platform/module-ballerina-cache'
credentials {
Expand Down Expand Up @@ -105,34 +94,13 @@ allprojects {
}
}
// Transitive dependencies
maven {
url = 'https://maven.pkg.github.com/ballerina-platform/module-ballerina-config'
credentials {
username System.getenv("packageUser")
password System.getenv("packagePAT")
}
}
maven {
url = 'https://maven.pkg.github.com/ballerina-platform/module-ballerina-io'
credentials {
username System.getenv("packageUser")
password System.getenv("packagePAT")
}
}
maven {
url = 'https://maven.pkg.github.com/ballerina-platform/module-ballerina-runtime'
credentials {
username System.getenv("packageUser")
password System.getenv("packagePAT")
}
}
maven {
url = 'https://maven.pkg.github.com/ballerina-platform/module-ballerina-system'
credentials {
username System.getenv("packageUser")
password System.getenv("packagePAT")
}
}
maven {
url = 'https://maven.pkg.github.com/ballerina-platform/module-ballerina-task'
credentials {
Expand All @@ -151,17 +119,13 @@ subprojects {
}
dependencies {
/* Standard libraries */
ballerinaStdLibs "org.ballerinalang:auth-ballerina:${stdlibAuthVersion}"
ballerinaStdLibs "org.ballerinalang:cache-ballerina:${stdlibCacheVersion}"
ballerinaStdLibs "org.ballerinalang:crypto-ballerina:${stdlibCryptoVersion}"
ballerinaStdLibs "org.ballerinalang:log-ballerina:${stdlibLogVersion}"
ballerinaStdLibs "org.ballerinalang:stringutils-ballerina:${stdlibStringUtilsVersion}"
ballerinaStdLibs "org.ballerinalang:time-ballerina:${stdlibTimeVersion}"
// Transitive dependencies
ballerinaStdLibs "org.ballerinalang:config-ballerina:${stdlibConfigVersion}"
ballerinaStdLibs "org.ballerinalang:io-ballerina:${stdlibIoVersion}"
ballerinaStdLibs "org.ballerinalang:runtime-ballerina:${stdlibRuntimeVersion}"
ballerinaStdLibs "org.ballerinalang:system-ballerina:${stdlibSystemVersion}"
ballerinaStdLibs "org.ballerinalang:task-ballerina:${stdlibTaskVersion}"
}
}
Expand Down
4 changes: 0 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@ org.gradle.caching=true
group=org.ballerinalang
version=1.0.5-SNAPSHOT
ballerinaLangVersion=2.0.0-Preview9-SNAPSHOT
stdlibAuthVersion=1.0.5-SNAPSHOT
stdlibCacheVersion=2.0.5-SNAPSHOT
stdlibCryptoVersion=1.0.5-SNAPSHOT
stdlibLogVersion=1.0.5-SNAPSHOT
stdlibStringUtilsVersion=0.5.5-SNAPSHOT
stdlibTimeVersion=1.0.6-SNAPSHOT
# Transitive dependencies
stdlibConfigVersion=1.0.5-SNAPSHOT
stdlibIoVersion=0.5.5-SNAPSHOT
stdlibRuntimeVersion=0.5.5-SNAPSHOT
stdlibSystemVersion=0.6.5-SNAPSHOT
stdlibTaskVersion=1.1.5-SNAPSHOT
18 changes: 0 additions & 18 deletions issue_template.md

This file was deleted.

5 changes: 0 additions & 5 deletions oauth2-ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ org = "ballerina"
name = "oauth2"
version = "@toml.version@"

[[dependency]]
org = "ballerina"
name = "auth"
version = "@stdlib.auth.version@"

[[dependency]]
org = "ballerina"
name = "cache"
Expand Down
2 changes: 0 additions & 2 deletions oauth2-ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ def originalConfig = ballerinaConfigFile.text

task updateTomlVersions {
doLast {
def stdlibDependentAuthVersion = project.stdlibAuthVersion.split("-")[0]
def stdlibDependentCacheVersion = project.stdlibCacheVersion.split("-")[0]
def stdlibDependentCryptoVersion = project.stdlibCryptoVersion.split("-")[0]
def stdlibDependentLogVersion = project.stdlibLogVersion.split("-")[0]
Expand All @@ -95,7 +94,6 @@ task updateTomlVersions {

def newConfig = ballerinaConfigFile.text.replace("@project.version@", project.version)
newConfig = newConfig.replace("@toml.version@", tomlVersion)
newConfig = newConfig.replace("@stdlib.auth.version@", stdlibDependentAuthVersion)
newConfig = newConfig.replace("@stdlib.cache.version@", stdlibDependentCacheVersion)
newConfig = newConfig.replace("@stdlib.crypto.version@", stdlibDependentCryptoVersion)
newConfig = newConfig.replace("@stdlib.log.version@", stdlibDependentLogVersion)
Expand Down
Loading