Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 114b67ee authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch '454-main-move_project' into 'main' 

privacymoduletor: fix ci pipeline and fix project id

See merge request !6
parents a81f503d a4d30c12

build.gradle

+23 −8
Original line number Diff line number Diff line
@@ -40,6 +40,20 @@ configure(project(':orbotservice')) { 
                }



                repositories {

                    def ciJobToken = System.getenv("CI_JOB_TOKEN")

                    def ciApiV4Url = System.getenv("CI_API_V4_URL")

                    if (ciJobToken != null) {

                        maven {

                            url "${ciApiV4Url}/projects/1063/packages/maven"

                            credentials(HttpHeaderCredentials) {

                                name = 'Job-Token'

                                value = ciJobToken

                            }

                            authentication {

                                header(HttpHeaderAuthentication)

                            }

                        }

                    } else {

                        maven {

                            url "https://gitlab.e.foundation/api/v4/projects/1063/packages/maven"

                            credentials(HttpHeaderCredentials) {
@@ -56,3 +70,4 @@ configure(project(':orbotservice')) { 
            }

        }

    }

}

privacymoduletor/build.gradle

+23 −8
Original line number Diff line number Diff line
@@ -81,6 +81,20 @@ publishing { 
                }

            }

            repositories {

                def ciJobToken = System.getenv("CI_JOB_TOKEN")

                def ciApiV4Url = System.getenv("CI_API_V4_URL")

                if (ciJobToken != null) {

                    maven {

                        url "${ciApiV4Url}/projects/1063/packages/maven"

                        credentials(HttpHeaderCredentials) {

                            name = 'Job-Token'

                            value = ciJobToken

                        }

                        authentication {

                            header(HttpHeaderAuthentication)

                        }

                    }

                } else {

                    maven {

                        url "https://gitlab.e.foundation/api/v4/projects/1063/packages/maven"

                        credentials(HttpHeaderCredentials) {
@@ -96,3 +110,4 @@ publishing { 
            }

        }

    }

}

settings.gradle

+25 −8
Original line number Diff line number Diff line
@@ -7,8 +7,23 @@ dependencyResolutionManagement { 
        maven { url 'https://jitpack.io' }



        mavenLocal()

        def ciJobToken = System.getenv("CI_JOB_TOKEN")

        def ciApiV4Url = System.getenv("CI_API_V4_URL")

        if (ciJobToken != null) {

            maven {

            url "https://gitlab.e.foundation/api/v4/groups/13662/-/packages/maven"

                url "${ciApiV4Url}/groups/9/-/packages/maven"

                name "GitLab"

                credentials(HttpHeaderCredentials) {

                    name = 'Job-Token'

                    value = ciJobToken

                }

                authentication {

                    header(HttpHeaderAuthentication)

                }

            }

        } else {

            maven {

                url "https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven"

                name "GitLab"

                credentials(HttpHeaderCredentials) {

                    name = 'Private-Token'
@@ -19,6 +34,8 @@ dependencyResolutionManagement { 
                }

            }

        }



    }

}