Skip to content

Commit

Permalink
Update our build scripts to release to maven central. (#242)
Browse files Browse the repository at this point in the history
* Update our build scripts to release to maven central.

* Update changelog and readme.
  • Loading branch information
JayNewstrom authored Jun 21, 2021
1 parent b9cdb73 commit bf76d04
Show file tree
Hide file tree
Showing 8 changed files with 137 additions and 150 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# 1.0.19

### Bug Fix

- [#230](https://github.com/okta/okta-oidc-android/pull/230) Fixes androidx lifecycle compliance

### Other

- [#242](https://github.com/okta/okta-oidc-android/pull/242) Publish to maven central rather than jcenter.
- Remove support for non androidx variant.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ dependencies {
...
...
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
implementation 'com.okta.android:oidc-androidx:1.0.16'
implementation 'com.okta.android:oidc-androidx:1.0.19'
implementation 'com.okta.authn.sdk:okta-authn-sdk-api:2.0.0'
implementation('com.okta.authn.sdk:okta-authn-sdk-impl:2.0.0') {
exclude group: 'com.okta.sdk', module: 'okta-sdk-httpclient'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ subprojects {

ext {
versionNum = 19
versionName = "1.0.17"
versionName = "1.0.19"
versionDate = new Date()
minSdkVersion = 21
compileSdkVersion = 30
Expand Down
17 changes: 16 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,19 @@ org.gradle.jvmargs=-Xmx1536m
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=true

GROUP=com.okta.android

POM_DESCRIPTION=Okta OpenID Connect & OAuth 2.0
POM_URL=https://github.com/okta/okta-oidc-android
POM_SCM_URL=https://github.com/okta/okta-oidc-android.git
POM_SCM_CONNECTION=scm:[email protected]:okta/okta-oidc-android.git
POM_SCM_DEV_CONNECTION=scm:[email protected]:okta/okta-oidc-android.git

POM_LICENSE_NAME=The Apache Software License, Version 2.0
POM_LICENSE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENSE_DIST=repo

POM_DEVELOPER_ID=okta
POM_DEVELOPER_NAME=Okta
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ dependencyCheck {
suppressionFile file("../dependency-suppression.xml").toString()
}

if (project.rootProject.file('local.properties').exists()) {
apply from: 'publish.gradle'
if (hasProperty('NEXUS_USERNAME')) {
apply from: 'maven-push.gradle'
}
3 changes: 3 additions & 0 deletions library/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
POM_NAME=Okta OIDC Android
POM_ARTIFACT_ID=okta-oidc-android
POM_PACKAGING=aar
104 changes: 104 additions & 0 deletions library/maven-push.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/*
* Copyright 2013 Chris Banes
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

apply plugin: 'maven'
apply plugin: 'signing'

def isReleaseBuild() {
return rootProject.ext.versionName.contains("SNAPSHOT") == false
}

def getReleaseRepositoryUrl() {
return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
: "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
}

def getSnapshotRepositoryUrl() {
return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
: "https://oss.sonatype.org/content/repositories/snapshots/"
}

def getRepositoryUsername() {
return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
}

def getRepositoryPassword() {
return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
}

afterEvaluate { project ->
uploadArchives {
repositories {
mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

pom.groupId = GROUP
pom.artifactId = POM_ARTIFACT_ID
pom.version = rootProject.ext.versionName

repository(url: getReleaseRepositoryUrl()) {
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
}
snapshotRepository(url: getSnapshotRepositoryUrl()) {
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
}

pom.project {
name POM_NAME
packaging POM_PACKAGING
description POM_DESCRIPTION
url POM_URL

scm {
url POM_SCM_URL
connection POM_SCM_CONNECTION
developerConnection POM_SCM_DEV_CONNECTION
}

licenses {
license {
name POM_LICENSE_NAME
url POM_LICENSE_URL
distribution POM_LICENSE_DIST
}
}

developers {
developer {
id POM_DEVELOPER_ID
name POM_DEVELOPER_NAME
}
}
}
}
}
}

signing {
useGpgCmd()
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
sign configurations.archives
}

task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.sourceFiles
}

artifacts {
archives androidSourcesJar
}
}
145 changes: 0 additions & 145 deletions library/publish.gradle

This file was deleted.

0 comments on commit bf76d04

Please sign in to comment.