Fixed build config

ical4j · Aug 3, 2023 · 9b69cc4 · 9b69cc4
1 parent 68ca492
commit 9b69cc4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/.env b/.env
@@ -1 +1,4 @@
+CHANGELOG_START_TAG=ical4j-template-0.1.0
+CHANGELOG_END_TAG=HEAD
+
 GRADLE_VERSION=7.6
diff --git a/.github/workflows/publish-snapshots.yml b/.github/workflows/publish-snapshots.yml
@@ -25,5 +25,5 @@ jobs:
         env:
           GPR_USERNAME: benfortuna
           GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
diff --git a/Makefile b/Makefile
@@ -23,6 +23,10 @@ test:
 build:
 	./gradlew build
 
+changelog:
+	git log "$(CHANGELOG_START_TAG)...$(CHANGELOG_END_TAG)" \
+    	--pretty=format:'* %s [View commit](http://github.com/ical4j/ical4j-template/commit/%H)' --reverse | grep -v Merge
+
 currentVersion:
 	./gradlew -q currentVersion
 

diff --git a/build.gradle b/build.gradle
@@ -79,7 +79,7 @@ javadoc {
 
 scmVersion {
     tag {
-        prefix = 'ical4j-templates-'
+        prefix = 'ical4j-template-'
     }
     versionCreator 'versionWithBranch'
     branchVersionCreator = ['master': 'simple']
@@ -89,7 +89,7 @@ version = scmVersion.version
 jar {
     manifest {
         attributes (
-                'Implementation-Title': 'iCal4j Templates',
+                'Implementation-Title': 'iCal4j Template',
                 'Implementation-Version': version,
                 'Implementation-Vendor': 'Ben Fortuna'
         )
@@ -110,9 +110,9 @@ publishing {
                 asNode().appendNode('url', 'http://ical4j.github.io')
 
                 def scmNode = asNode().appendNode('scm')
-                scmNode.appendNode('url', 'https://github.com/ical4j/ical4j-templates')
-                scmNode.appendNode('connection', 'scm:git@github.com:ical4j/ical4j-templates.git')
-                scmNode.appendNode('developerConnection', 'scm:git@github.com:ical4j/ical4j-templates.git')
+                scmNode.appendNode('url', 'https://github.com/ical4j/ical4j-template')
+                scmNode.appendNode('connection', 'scm:git@github.com:ical4j/ical4j-template.git')
+                scmNode.appendNode('developerConnection', 'scm:git@github.com:ical4j/ical4j-template.git')
 
                 def licenseNode = asNode().appendNode('licenses').appendNode('license')
                 licenseNode.appendNode('name', 'iCal4j - License')
@@ -125,6 +125,17 @@ publishing {
             }
         }
     }
+
+    repositories {
+            maven {
+                name = "OSSRH"
+                url = version.endsWith('SNAPSHOT') ? "https://s01.oss.sonatype.org/content/repositories/snapshots/" : "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        }
 }
 
 signing {