From d1d5524acf0511c3e860d6d0ab34d72c1df2e38d Mon Sep 17 00:00:00 2001
From: Yohan BITTAN <yohan.bittan@blablacar.com>
Date: Wed, 4 Jan 2023 15:05:15 +0100
Subject: [PATCH 1/4] Publishing artefact to maven [WIP]

Jira: BBC-23342
---
 build.gradle.kts      |  6 +++++-
 gradle.properties     |  6 +++++-
 gradle/publish.gradle | 30 ++++++++++++++++++++++++------
 updatePlugins.xml     | 28 ++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 updatePlugins.xml

diff --git a/build.gradle.kts b/build.gradle.kts
index cf2fbb9..39bee26 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,11 +15,15 @@ plugins {
     id("org.jetbrains.changelog") version "1.3.1"
     // Gradle Qodana Plugin
     id("org.jetbrains.qodana") version "0.1.13"
+
+    id("maven-publish")
 }
 
 group = properties("pluginGroup")
 version = properties("pluginVersion")
 
+apply(from="./gradle/publish.gradle")
+
 // Configure project's dependencies
 repositories {
     mavenCentral()
@@ -121,4 +125,4 @@ tasks {
         channels.set(listOf(properties("pluginVersion").split('-').getOrElse(1) { "default" }
             .split('.').first()))
     }
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index de54d6f..244c4ae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ pluginGroup = com.comuto.androidtemplates
 pluginName = Android Templates Plugin
 pluginRepositoryUrl = https://github.com/blablacar/android-template-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.0.1
+pluginVersion = 0.2
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
@@ -41,3 +41,7 @@ VERSION_NAME=0.2
 GROUP=com.comuto
 ARTIFACT_ID=android-template-plugin
 LIBRARY_NAME=android-template-plugin
+PACKAGING=jar
+DEVELOPER_ID=blablacar
+DEVELOPER_NAME=BlaBlaCar
+DEVELOPER_EMAIL=android-devs@blablacar.com
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 6e6071c..fade2a5 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -1,7 +1,8 @@
-task letsgo(dependsOn: ['lint', 'publish']) {
+task letsgo(dependsOn: ['publish']) {
     doFirst {
         println 'Let\'s go template plugin !'
     }
+
 }
 
 task sourcesJar(type: Jar) {
@@ -13,6 +14,13 @@ artifacts {
     archives sourcesJar
 }
 
+
+def xmlFile = layout.projectDirectory.file('updatePlugins.xml')
+println "gooo ${xmlFile}"
+def xmlArtifact = artifacts.add('archives', xmlFile.get().asFile) {
+    type 'xml'
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
@@ -20,15 +28,14 @@ publishing {
             artifactId = ARTIFACT_ID
             version = isReleaseBuild() ? VERSION_NAME : VERSION_NAME + generateSnapshotSuffix()
 
-            afterEvaluate {
-                artifact bundleReleaseAar
-                artifact sourcesJar
-            }
+
+            from components.java
+
+            artifact xmlArtifact
 
             pom {
                 name = PROJECT_NAME
                 description = PROJECT_DESCRIPTION
-                url = WEBSITE_URL
                 packaging = PACKAGING
                 groupId = GROUP
                 artifactId = ARTIFACT_ID
@@ -44,15 +51,26 @@ publishing {
     }
 
     repositories {
+        mavenLocal()
+        /*
+        flatDir {
+            dirs "${project.rootDir}/libs"
+        }
+
+         */
+       /*
         maven {
             name "githubBlablacar"
             url "https://maven.pkg.github.com/blablacar/java-packages"
             credentials(PasswordCredentials)
         }
+        */
     }
 }
 
 tasks.withType(AbstractPublishToMaven) {
+
+
     doLast {
         def name = "${publication.groupId}:${publication.artifactId}:${publication.version}"
         if (it instanceof PublishToMavenRepository) {
diff --git a/updatePlugins.xml b/updatePlugins.xml
new file mode 100644
index 0000000..70f8d2c
--- /dev/null
+++ b/updatePlugins.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The <plugins> element (required) contains the description of the plugins
+available at this repository.
+-->
+<plugins>
+    <!--
+    Each <plugin> element (required) describes one plugin in the repository.
+    Attributes:
+     - "id" (required) - used by JetBrains IDEs to uniquely identify
+       a plugin. Must match <id> in the plugin.xml file.
+     - "url" (required) - URL to download the plugin JAR/ZIP file.
+       Must be HTTPS.
+     - "version" (required) - version of this plugin. Must match <version>
+       in the plugin.xml file.
+    -->
+    <plugin
+        id="com.comuto.android-template.pluging"
+        url="${plugin_url}"
+        version="${pluginVersion}">
+        <!--
+        The <idea-version> element (required) must match the same element
+        in the plugin.xml file.
+        -->
+        <idea-version since-build="${pluginSinceBuild}" until-build="${pluginUntilBuild}"/>
+    </plugin>
+
+</plugins>

From 2959c7f8868c2191f89f98f1d877df5c05966e0d Mon Sep 17 00:00:00 2001
From: Yohan BITTAN <yohan.bittan@blablacar.com>
Date: Fri, 6 Jan 2023 12:00:57 +0100
Subject: [PATCH 2/4] WIP

---
 gradle.properties     |  3 ++-
 gradle/publish.gradle | 54 +++++++++++++++++++++++++++----------------
 updatePlugins.xml     |  2 +-
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 244c4ae..48c43df 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -37,7 +37,6 @@ kotlin.stdlib.default.dependency = false
 
 PROJECT_NAME=Android template plugin
 PROJECT_DESCRIPTION=Android template plugin
-VERSION_NAME=0.2
 GROUP=com.comuto
 ARTIFACT_ID=android-template-plugin
 LIBRARY_NAME=android-template-plugin
@@ -45,3 +44,5 @@ PACKAGING=jar
 DEVELOPER_ID=blablacar
 DEVELOPER_NAME=BlaBlaCar
 DEVELOPER_EMAIL=android-devs@blablacar.com
+
+repository_url = https://maven.pkg.github.com/blablacar/java-packages
\ No newline at end of file
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index fade2a5..4d3cfa1 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -1,8 +1,27 @@
+def xmlFile = layout.projectDirectory.file('updatePlugins.xml')
+def xmlArtifact = artifacts.add('archives', xmlFile) {
+    type 'xml'
+}
+
 task letsgo(dependsOn: ['publish']) {
     doFirst {
         println 'Let\'s go template plugin !'
-    }
 
+        def text = 'Dear "$firstname $lastname",\nSo nice to meet you in <% print city %>.\nSee you in ${month},\n${signed}'
+
+        def binding = [
+            "plugin_url":TODO(),
+            "pluginVersion":pluginVersion,
+            "pluginSinceBuild":pluginSinceBuild,
+            "pluginUntilBuild":pluginUntilBuild
+        ]
+
+        def engine = new groovy.text.SimpleTemplateEngine()
+        def template = engine.createTemplate(text).make(binding)
+
+        def result = 'Dear "Sam Pullara",\nSo nice to meet you in San Francisco.\nSee you in December,\nGroovy-Dev'
+        println(result)
+    }
 }
 
 task sourcesJar(type: Jar) {
@@ -14,25 +33,21 @@ artifacts {
     archives sourcesJar
 }
 
-
-def xmlFile = layout.projectDirectory.file('updatePlugins.xml')
-println "gooo ${xmlFile}"
-def xmlArtifact = artifacts.add('archives', xmlFile.get().asFile) {
-    type 'xml'
-}
-
 publishing {
     publications {
+        maven(MavenPublication) {
+            artifact xmlArtifact
+            groupId = GROUP
+            artifactId = ARTIFACT_ID
+            version = "index"
+        }
         mavenJava(MavenPublication) {
             groupId = GROUP
             artifactId = ARTIFACT_ID
-            version = isReleaseBuild() ? VERSION_NAME : VERSION_NAME + generateSnapshotSuffix()
-
+            version = isReleaseBuild() ? pluginVersion : pluginVersion + generateSnapshotSuffix()
 
             from components.java
 
-            artifact xmlArtifact
-
             pom {
                 name = PROJECT_NAME
                 description = PROJECT_DESCRIPTION
@@ -58,19 +73,18 @@ publishing {
         }
 
          */
-       /*
-        maven {
-            name "githubBlablacar"
-            url "https://maven.pkg.github.com/blablacar/java-packages"
-            credentials(PasswordCredentials)
-        }
-        */
+        /*
+         maven {
+             name "githubBlablacar"
+             url "https://maven.pkg.github.com/blablacar/java-packages"
+             credentials(PasswordCredentials)
+         }
+         */
     }
 }
 
 tasks.withType(AbstractPublishToMaven) {
 
-
     doLast {
         def name = "${publication.groupId}:${publication.artifactId}:${publication.version}"
         if (it instanceof PublishToMavenRepository) {
diff --git a/updatePlugins.xml b/updatePlugins.xml
index 70f8d2c..70031ad 100644
--- a/updatePlugins.xml
+++ b/updatePlugins.xml
@@ -15,7 +15,7 @@ available at this repository.
        in the plugin.xml file.
     -->
     <plugin
-        id="com.comuto.android-template.pluging"
+        id="com.comuto.android-template.plugin"
         url="${plugin_url}"
         version="${pluginVersion}">
         <!--

From e4f3d88ad5b7e3b975f2e356b66e942903b63060 Mon Sep 17 00:00:00 2001
From: Yohan BITTAN <yohan.bittan@blablacar.com>
Date: Wed, 11 Jan 2023 18:28:26 +0100
Subject: [PATCH 3/4] WIP

---
 .gitignore                                    |  1 +
 gradle.properties                             |  2 +-
 gradle/publish.gradle                         | 59 +++++++++++--------
 jenkins/JenkinsfilePublishDebug               | 33 -----------
 jenkins/jobs.groovy                           | 13 +---
 ...ePlugins.xml => updatePlugins_template.xml |  0
 6 files changed, 36 insertions(+), 72 deletions(-)
 delete mode 100644 jenkins/JenkinsfilePublishDebug
 rename updatePlugins.xml => updatePlugins_template.xml (100%)

diff --git a/.gitignore b/.gitignore
index ac692a0..3f34a29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 .qodana
 build
 local.properties
+updatePlugins_tmp.xml
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 48c43df..076b798 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ pluginGroup = com.comuto.androidtemplates
 pluginName = Android Templates Plugin
 pluginRepositoryUrl = https://github.com/blablacar/android-template-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.2
+pluginVersion = 0.2.2
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 4d3cfa1..9640eb8 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -1,26 +1,35 @@
-def xmlFile = layout.projectDirectory.file('updatePlugins.xml')
-def xmlArtifact = artifacts.add('archives', xmlFile) {
-    type 'xml'
+
+def version = pluginVersion
+
+task fillTemplate {
+    // fill the updatePlugins template
+    String fileContents = new File('updatePlugins_template.xml').text
+
+    String fileUrl = "${repository_url}/com/comuto/android-template-plugin/android-template-plugin-${version}.jar"
+
+    def binding = [
+        "plugin_url":fileUrl,
+        "pluginVersion":pluginVersion,
+        "pluginSinceBuild":pluginSinceBuild,
+        "pluginUntilBuild":pluginUntilBuild
+    ]
+
+    def engine = new groovy.text.SimpleTemplateEngine()
+    def filledTemplate = engine.createTemplate(fileContents).make(binding)
+
+    def result = filledTemplate
+    def destFile = new File('updatePlugins_tmp.xml')
+    destFile.createNewFile()
+    destFile.text = result
 }
 
+tasks.publish.dependsOn(fillTemplate)
+
 task letsgo(dependsOn: ['publish']) {
     doFirst {
         println 'Let\'s go template plugin !'
 
-        def text = 'Dear "$firstname $lastname",\nSo nice to meet you in <% print city %>.\nSee you in ${month},\n${signed}'
-
-        def binding = [
-            "plugin_url":TODO(),
-            "pluginVersion":pluginVersion,
-            "pluginSinceBuild":pluginSinceBuild,
-            "pluginUntilBuild":pluginUntilBuild
-        ]
 
-        def engine = new groovy.text.SimpleTemplateEngine()
-        def template = engine.createTemplate(text).make(binding)
-
-        def result = 'Dear "Sam Pullara",\nSo nice to meet you in San Francisco.\nSee you in December,\nGroovy-Dev'
-        println(result)
     }
 }
 
@@ -35,16 +44,22 @@ artifacts {
 
 publishing {
     publications {
+        def xmlFile = layout.projectDirectory.file('updatePlugins_tmp.xml')
+        def xmlArtifact = artifacts.add('archives', xmlFile) {
+            type 'xml'
+        }
+
         maven(MavenPublication) {
             artifact xmlArtifact
             groupId = GROUP
             artifactId = ARTIFACT_ID
             version = "index"
         }
+
         mavenJava(MavenPublication) {
             groupId = GROUP
             artifactId = ARTIFACT_ID
-            version = isReleaseBuild() ? pluginVersion : pluginVersion + generateSnapshotSuffix()
+            version = version
 
             from components.java
 
@@ -76,7 +91,7 @@ publishing {
         /*
          maven {
              name "githubBlablacar"
-             url "https://maven.pkg.github.com/blablacar/java-packages"
+             url "{repository_ur}"
              credentials(PasswordCredentials)
          }
          */
@@ -93,12 +108,4 @@ tasks.withType(AbstractPublishToMaven) {
             println "******************** Published $name to local repository  *****************"
         }
     }
-}
-
-static def generateSnapshotSuffix() {
-    return "-" + new Date().format("yyyyMMddHHmmssSSS", TimeZone.getTimeZone("UTC")) + "-SNAPSHOT"
-}
-
-def isReleaseBuild() {
-    return project.hasProperty('env') && project.property('env') == "RELEASE"
 }
\ No newline at end of file
diff --git a/jenkins/JenkinsfilePublishDebug b/jenkins/JenkinsfilePublishDebug
deleted file mode 100644
index e9e5e0b..0000000
--- a/jenkins/JenkinsfilePublishDebug
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-    agent {
-        docker {
-            label 'docker'
-            image 'eu.gcr.io/bbc-registry/android:1.20201108.114924-6c08d93'
-            args '-v ${HOME}/.gradle/gradle.properties:/root/.gradle/gradle.properties:ro'
-        }
-    }
-
-    options {
-        buildDiscarder(logRotator(numToKeepStr: "10"))
-        timeout(time: 60, unit: 'MINUTES')
-    }
-
-    stages {
-        stage('Compile and publish a version') {
-            environment {
-                GIT_SSH_COMMAND = 'ssh -o StrictHostKeyChecking=no'
-                GIT_AUTHOR_NAME = 'Jenkins'
-                EMAIL = 'svc-git@blablacar.com'
-            }
-            steps {
-                sshagent(credentials: ['github-blablacarbot-ssh']) {
-                    sh 'git fetch origin'
-                    sh "git checkout ${params.branch}"
-                    sh "./gradlew clean letsgo --rerun-tasks"
-                }
-            }
-        }
-    }
-}
diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy
index b1a5696..07c8605 100644
--- a/jenkins/jobs.groovy
+++ b/jenkins/jobs.groovy
@@ -2,17 +2,6 @@ final String rootFolder = 'android-jobs/template-plugin'
 final String pipelinesFolder = 'jenkins'
 final String mainBranch = 'master'
 
-final String debugParameters = '''
-    parameters {
-        stringParam('branch', '', 'branch to publish, e.g. feature/BBC-XXXX or bugfix/BBC-XXXX')
-      }
-'''
-
-return [[name       : "$rootFolder/template-plugin-publish-debug",
-         jenkinsfile: "$pipelinesFolder/JenkinsfilePublishDebug",
-         branch     : mainBranch,
-         extra      : debugParameters],
-
-        [name       : "$rootFolder/template-plugin-publish-release",
+return [[name       : "$rootFolder/template-plugin-publish-release",
          jenkinsfile: "$pipelinesFolder/JenkinsfilePublishRelease",
          branch     : mainBranch]]
diff --git a/updatePlugins.xml b/updatePlugins_template.xml
similarity index 100%
rename from updatePlugins.xml
rename to updatePlugins_template.xml

From e432b2e418f87885c8c2c985c4f8cd63c7d8a730 Mon Sep 17 00:00:00 2001
From: Yohan BITTAN <yohan.bittan@blablacar.com>
Date: Wed, 18 Jan 2023 14:59:01 +0100
Subject: [PATCH 4/4] devops for the plugin

Jira: BBC-23342
---
 gradle.properties     |  2 +-
 gradle/publish.gradle | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 076b798..fd4b6fc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ pluginGroup = com.comuto.androidtemplates
 pluginName = Android Templates Plugin
 pluginRepositoryUrl = https://github.com/blablacar/android-template-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.2.2
+pluginVersion = 0.2.5
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 9640eb8..40392b5 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -1,5 +1,4 @@
-
-def version = pluginVersion
+def versionToDeploy = pluginVersion
 
 task fillTemplate {
     // fill the updatePlugins template
@@ -59,7 +58,7 @@ publishing {
         mavenJava(MavenPublication) {
             groupId = GROUP
             artifactId = ARTIFACT_ID
-            version = version
+            version = versionToDeploy
 
             from components.java
 
@@ -81,20 +80,14 @@ publishing {
     }
 
     repositories {
+       /*
         mavenLocal()
-        /*
-        flatDir {
-            dirs "${project.rootDir}/libs"
-        }
-
-         */
-        /*
-         maven {
+        */
+        maven {
              name "githubBlablacar"
              url "{repository_ur}"
              credentials(PasswordCredentials)
          }
-         */
     }
 }