diff --git a/JsonRules/.gitignore b/JsonRules/.gitignore new file mode 100644 index 00000000..01a292f1 --- /dev/null +++ b/JsonRules/.gitignore @@ -0,0 +1,92 @@ +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# VSCode project file. +.project +.classpath +.settings + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea + +# Keystore files +# Uncomment the following line if you do not want to check your keystore files in. +#*.jks + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# Ignore poms +*.pom + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# gradle stuffs +gradlew +gradlew.bat +gradle-wrapper.jar diff --git a/JsonRules/build.gradle b/JsonRules/build.gradle new file mode 100644 index 00000000..70c34dd1 --- /dev/null +++ b/JsonRules/build.gradle @@ -0,0 +1,120 @@ +plugins { + id 'java-library' + id 'maven-publish' +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 +} + +dependencies { + implementation "org.jsonschema2pojo:jsonschema2pojo-core:1.1.1" +} + +apply from: './versioning/version_tasks.gradle' + +version = getAppVersionName() + +project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME") : project.findProperty("vstsUsername") +project.ext.vstsPassword = System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") + +task sourcesJar(type: Jar) { + from sourceSets.main.java.srcDirs + classifier = 'sources' + destinationDirectory = reporting.file("$project.buildDir/output/jars") +} + +// Task to generate javadoc +task generateJavadoc(type: Javadoc) { + failOnError false + title = "Microsoft Identity Json2POJO Rules" + source = sourceSets.main.java + classpath += project.sourceSets.main.compileClasspath + + options.memberLevel = JavadocMemberLevel.PUBLIC + options.addStringOption('Xdoclint:none', '-quiet') + + exclude '**/BuildConfig.Java' + exclude '**/R.java' + destinationDir = reporting.file("$project.buildDir/output/javadoc") +} + +// Task to generate javadoc.jar +task javadocJar(type: Jar, dependsOn: generateJavadoc) { + from javadoc.destinationDir + classifier 'javadoc' + destinationDirectory = reporting.file("$project.buildDir/output/jars") +} + +jar { + manifest { + attributes('Implementation-Title': project.name, + 'Implementation-Version': project.version) + } +} + +publishing { + publications { + aar(MavenPublication) { + groupId 'com.microsoft.identity.json' + artifactId 'rules' + from components.java + + pom { + name = 'common4j' + description = 'This library contains rules for generating Java classes from Json ' + + 'schema using the jsonschema2pojo library.' + url = 'https://github.com/AzureAD/android-complete' + developers { + developer { + id = 'microsoft' + name = 'Microsoft' + } + } + licenses { + license { + name = 'MIT License' + } + } + inceptionYear = '2021' + scm { + url = 'https://github.com/AzureAD/android-complete' + } + properties = [ + branch : 'master', + version: project.version + ] + } + } + } + + repositories { + maven { + name "vsts-maven-adal-android" + url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1" + credentials { + username project.ext.vstsUsername + password project.ext.vstsPassword + } + } + maven { + name "vsts-maven-android" + url 'https://identitydivision.pkgs.visualstudio.com/IDDP/_packaging/Android/maven/v1' + credentials { + username project.vstsUsername + password project.vstsPassword + } + } + } +} + +sourceSets { + main { + java.srcDirs = ['src/main'] + } + test { + java.srcDirs = ['src/test'] + } +} + diff --git a/JsonRules/changelog b/JsonRules/changelog new file mode 100644 index 00000000..1242302d --- /dev/null +++ b/JsonRules/changelog @@ -0,0 +1,12 @@ +Version 0.0.3 +---------------------------- +- Update Map Rule to generate Map that maps Strings keys to Object values + +Version 0.0.2 +---------------------------- +- Add a Rule to generate private no-arg constructor if both constructors and setters disabled + +Version 0.0.1 +---------------------------- +- Add a MapRule to generate Map fields +- Add a custom rule factory that that overrides the TypeRule and also provides a MapRule diff --git a/JsonRules/gradle/wrapper/gradle-wrapper.properties b/JsonRules/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..be52383e --- /dev/null +++ b/JsonRules/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/JsonRules/src/main/com/microsoft/identity/json/rules/AuthClientJsonSchemaObjectRule.java b/JsonRules/src/main/com/microsoft/identity/json/rules/AuthClientJsonSchemaObjectRule.java new file mode 100644 index 00000000..fe812cdc --- /dev/null +++ b/JsonRules/src/main/com/microsoft/identity/json/rules/AuthClientJsonSchemaObjectRule.java @@ -0,0 +1,66 @@ +// Copyright (c) Microsoft Corporation. +// All rights reserved. +// +// This code is licensed under the MIT License. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files(the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions : +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +package com.microsoft.identity.json.rules; + +import com.fasterxml.jackson.databind.JsonNode; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JPackage; +import com.sun.codemodel.JType; + +import org.jsonschema2pojo.Schema; +import org.jsonschema2pojo.rules.ObjectRule; +import org.jsonschema2pojo.util.ParcelableHelper; +import org.jsonschema2pojo.util.ReflectionHelper; + +/** + * A custom {@link ObjectRule} that has the capability to generate private constructor if the + * config specified to NOT generate constructor AND also NOT generate any setters. + *

+ * We do this because if no constructor is generated, then JAVA will by default have a public + * NO-arg constructor for the class. This is a problem because this would allow someone to + * instantiate the object without actually populating any of its fields and also not having the + * ability to populate any fields post object construction because setters were not generated. To + * overcome this problem, we would simply generate a PRIVATE no-arg constructor so that no one can + * actually instantiate the object without any properties on it. + */ +public class AuthClientJsonSchemaObjectRule extends ObjectRule { + + private AuthClientJsonSchemaRuleFactory ruleFactory; + + protected AuthClientJsonSchemaObjectRule(AuthClientJsonSchemaRuleFactory ruleFactory, ParcelableHelper parcelableHelper, ReflectionHelper reflectionHelper) { + super(ruleFactory, parcelableHelper, reflectionHelper); + this.ruleFactory = ruleFactory; + } + + @Override + public JType apply(final String nodeName, final JsonNode node, final JsonNode parent, + final JPackage jPackage, final Schema schema) { + final JType jType = super.apply(nodeName, node, parent, jPackage, schema); + if (jType instanceof JDefinedClass + && !ruleFactory.getGenerationConfig().isIncludeConstructors() + && !ruleFactory.getGenerationConfig().isIncludeSetters()) { + new PrivateConstructorRule().apply(nodeName, node, parent, (JDefinedClass) jType, schema); + } + return jType; + } +} diff --git a/JsonRules/src/main/com/microsoft/identity/json/rules/AuthClientJsonSchemaRuleFactory.java b/JsonRules/src/main/com/microsoft/identity/json/rules/AuthClientJsonSchemaRuleFactory.java new file mode 100644 index 00000000..555f7395 --- /dev/null +++ b/JsonRules/src/main/com/microsoft/identity/json/rules/AuthClientJsonSchemaRuleFactory.java @@ -0,0 +1,60 @@ +// Copyright (c) Microsoft Corporation. +// All rights reserved. +// +// This code is licensed under the MIT License. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files(the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions : +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +package com.microsoft.identity.json.rules; + +import com.sun.codemodel.JClass; +import com.sun.codemodel.JClassContainer; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JPackage; +import com.sun.codemodel.JType; + +import org.jsonschema2pojo.rules.Rule; +import org.jsonschema2pojo.rules.RuleFactory; +import org.jsonschema2pojo.util.ParcelableHelper; + +/** + * A {@link RuleFactory} that provides a custom implementation of the {@link org.jsonschema2pojo.rules.TypeRule} + * and also provides an additional {@link MapRule} as well. + */ +public class AuthClientJsonSchemaRuleFactory extends RuleFactory { + + @Override + public Rule getTypeRule() { + return new AuthClientJsonSchemaTypeRule(this); + } + + /** + * Provides a rule instance that should be applied when an "object" + * declaration is found in the schema. + * + * @return a schema rule that can handle the "object" declaration. + */ + public Rule getMapRule() { + return new MapRule(); + } + + @Override + public Rule getObjectRule() { + return new AuthClientJsonSchemaObjectRule(this, new ParcelableHelper(), getReflectionHelper()); + } +} diff --git a/JsonRules/src/main/com/microsoft/identity/json/rules/AuthClientJsonSchemaTypeRule.java b/JsonRules/src/main/com/microsoft/identity/json/rules/AuthClientJsonSchemaTypeRule.java new file mode 100644 index 00000000..e1243839 --- /dev/null +++ b/JsonRules/src/main/com/microsoft/identity/json/rules/AuthClientJsonSchemaTypeRule.java @@ -0,0 +1,59 @@ +// Copyright (c) Microsoft Corporation. +// All rights reserved. +// +// This code is licensed under the MIT License. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files(the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions : +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +package com.microsoft.identity.json.rules; + +import com.fasterxml.jackson.databind.JsonNode; +import com.sun.codemodel.JClassContainer; +import com.sun.codemodel.JType; + +import org.jsonschema2pojo.Schema; +import org.jsonschema2pojo.rules.TypeRule; + +/** + * An implementation of {@link TypeRule} that will use a {@link MapRule} to generate a field of a + * Map data type if the type of the field in schema was defined as an "object" AND the field did not + * have any properties on it. Otherwise, this rule will just delegate the operation to its parent. + */ +public class AuthClientJsonSchemaTypeRule extends TypeRule { + + private final AuthClientJsonSchemaRuleFactory ruleFactory; + + protected AuthClientJsonSchemaTypeRule(final AuthClientJsonSchemaRuleFactory ruleFactory) { + super(ruleFactory); + this.ruleFactory = ruleFactory; + } + + @Override + public JType apply(String nodeName, JsonNode node, JsonNode parent, JClassContainer jClassContainer, Schema schema) { + if (node != null && + node.has("type") + && node.get("type") != null + && node.get("type").isTextual() + && node.get("type").asText().equals("object") + && (!node.has("properties") || node.path("properties").size() == 0)) { + return ruleFactory.getMapRule().apply(nodeName, node, parent, jClassContainer, schema); + } else { + return super.apply(nodeName, node, parent, jClassContainer, schema); + } + } +} diff --git a/JsonRules/src/main/com/microsoft/identity/json/rules/MapRule.java b/JsonRules/src/main/com/microsoft/identity/json/rules/MapRule.java new file mode 100644 index 00000000..a2d2e3cf --- /dev/null +++ b/JsonRules/src/main/com/microsoft/identity/json/rules/MapRule.java @@ -0,0 +1,48 @@ +// Copyright (c) Microsoft Corporation. +// All rights reserved. +// +// This code is licensed under the MIT License. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files(the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions : +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +package com.microsoft.identity.json.rules; + +import com.fasterxml.jackson.databind.JsonNode; +import com.sun.codemodel.JClass; +import com.sun.codemodel.JClassContainer; + +import org.jsonschema2pojo.Schema; +import org.jsonschema2pojo.rules.Rule; + +import java.util.Map; + +/** + * A {@link Rule} to generate fields with the Map data type. + */ +public class MapRule implements Rule { + @Override + public JClass apply(String nodeName, JsonNode node, JsonNode parent, JClassContainer jClassContainer, Schema schema) { + return addPropertyAsMap(jClassContainer); + } + + private JClass addPropertyAsMap(final JClassContainer jclass) { + return jclass.owner().ref(Map.class).narrow( + jclass.owner().ref(String.class), jclass.owner().ref(Object.class) + ); + } +} diff --git a/JsonRules/src/main/com/microsoft/identity/json/rules/PrivateConstructorRule.java b/JsonRules/src/main/com/microsoft/identity/json/rules/PrivateConstructorRule.java new file mode 100644 index 00000000..1110383f --- /dev/null +++ b/JsonRules/src/main/com/microsoft/identity/json/rules/PrivateConstructorRule.java @@ -0,0 +1,46 @@ +// Copyright (c) Microsoft Corporation. +// All rights reserved. +// +// This code is licensed under the MIT License. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files(the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions : +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +package com.microsoft.identity.json.rules; + +import com.fasterxml.jackson.databind.JsonNode; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JMod; + +import org.jsonschema2pojo.Schema; +import org.jsonschema2pojo.rules.Rule; + +/** + * A {@link Rule} that can generate a no-arg private constructor on a {@link JDefinedClass}. + */ +public class PrivateConstructorRule implements Rule { + @Override + public JDefinedClass apply(String nodeName, JsonNode node, JsonNode parent, JDefinedClass instanceClass, Schema currentSchema) { + generateNoArgsPrivateConstructor(instanceClass); + return instanceClass; + } + + private void generateNoArgsPrivateConstructor(final JDefinedClass jclass) { + // add a no-args constructor to this class + jclass.constructor(JMod.PRIVATE); + } +} diff --git a/JsonRules/versioning/version.properties b/JsonRules/versioning/version.properties new file mode 100644 index 00000000..1fa6df94 --- /dev/null +++ b/JsonRules/versioning/version.properties @@ -0,0 +1,3 @@ +#Wed May 12 20:08:39 UTC 2021 +versionName=0.0.3 +versionCode=1 diff --git a/JsonRules/versioning/version_tasks.gradle b/JsonRules/versioning/version_tasks.gradle new file mode 100644 index 00000000..de76c8b2 --- /dev/null +++ b/JsonRules/versioning/version_tasks.gradle @@ -0,0 +1,38 @@ +def getVersionFile() { + File file = new File("$rootDir/JsonRules/versioning/version.properties") + if(file.exists()){ + return file; + }else{ + return new File("$rootDir/versioning/version.properties") + } +} + +def getVersionProps() { + def versionProps = new Properties(); + getVersionFile().withInputStream {stream -> versionProps.load(stream)} + return versionProps +} + +private String getVersionNamePatch() { + return (getVersionProps()['versionName'] =~ /[^.]+/)[2].toString() +} + +private Integer getVersionNameMinor() { + return (getVersionProps()['versionName'] =~ /\d+/)[1].toInteger() +} + +private Integer getVersionNameMajor() { + return (getVersionProps()['versionName'] =~ /\d+/)[0].toInteger() +} + +private Integer getLatestPatchVersion() { + return getVersionProps()['latestPatchVersion'].toInteger() +} + +ext.getAppVersionCode = { + getVersionProps()['versionCode'].toInteger() +} + +ext.getAppVersionName = { + getVersionProps()['versionName'].toString() +} diff --git a/azure-pipelines/pull-request-validation/json-rules.yml b/azure-pipelines/pull-request-validation/json-rules.yml new file mode 100644 index 00000000..3611b6ad --- /dev/null +++ b/azure-pipelines/pull-request-validation/json-rules.yml @@ -0,0 +1,51 @@ +# File: azure-pipelines\pull-request-validation\json-rules.yml +# Description: Assemble Json Rules +# Variable: 'ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME' was defined in the Variables tab +# Variable: 'mvnAccessToken' was defined in the Variables tab +# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate +name: $(date:yyyyMMdd)$(rev:.r) + +trigger: + branches: + include: + - dev + - master + - release/* + batch: True + +resources: + repositories: + - repository: common + type: github + name: AzureAD/microsoft-authentication-library-common-for-android + ref: dev + endpoint: ANDROID_GITHUB + +jobs: + - job: Phase_1 + displayName: Build & Test + cancelTimeoutInMinutes: 1 + pool: + name: Hosted Windows 2019 with VS2019 + steps: + - checkout: self + clean: true + submodules: recursive + persistCredentials: True + - template: azure-pipelines/templates/steps/credscan-policheck.yml@common + parameters: + policheckCmdLineArgsDir: broker + - template: azure-pipelines/templates/steps/automation-cert.yml@common + parameters: + envVstsMvnAt: ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN + - task: Gradle@1 + name: Gradle1 + displayName: Assemble + inputs: + tasks: JsonRules:clean JsonRules:assemble --build-cache --info + publishJUnitResults: false + jdkArchitecture: x86 + sqAnalysisBreakBuildIfQualityGateFailed: false + - task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection +... diff --git a/azure-pipelines/vsts-releases/json-rules.yml b/azure-pipelines/vsts-releases/json-rules.yml new file mode 100644 index 00000000..edc1e3a1 --- /dev/null +++ b/azure-pipelines/vsts-releases/json-rules.yml @@ -0,0 +1,51 @@ +# File: azure-pipelines\vsts-releases\json-rules.yml +# Description: Assemble Json Rules +# Variable: 'ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME' was defined in the Variables tab +# Variable: 'mvnAccessToken' was defined in the Variables tab +# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate +name: $(date:yyyyMMdd)$(rev:.r) + +trigger: none +pr: none + +resources: + repositories: + - repository: common + type: github + name: AzureAD/microsoft-authentication-library-common-for-android + ref: dev + endpoint: ANDROID_GITHUB + +jobs: + - job: Phase_1 + displayName: Build & Publish + cancelTimeoutInMinutes: 1 + pool: + name: Hosted Windows 2019 with VS2019 + steps: + - checkout: self + clean: true + submodules: recursive + persistCredentials: True + - template: azure-pipelines/templates/steps/credscan-policheck.yml@common + parameters: + policheckCmdLineArgsDir: broker + - template: azure-pipelines/templates/steps/automation-cert.yml@common + parameters: + envVstsMvnAt: ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN + - task: Gradle@1 + name: Gradle1 + displayName: Assemble + inputs: + tasks: JsonRules:clean JsonRules:assemble --build-cache --info + publishJUnitResults: false + jdkArchitecture: x86 + sqAnalysisBreakBuildIfQualityGateFailed: false + - task: Gradle@2 + displayName: Publish + inputs: + tasks: JsonRules:publish + publishJUnitResults: false + - task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection +... diff --git a/settings.gradle b/settings.gradle index 0610b04f..2d5c2031 100644 --- a/settings.gradle +++ b/settings.gradle @@ -87,6 +87,8 @@ project(':LinuxBroker').projectDir = new File('broker/LinuxBroker') include(':LabApiUtilities') project(':LabApiUtilities').projectDir = new File('common/LabApiUtilities') +include(":JsonRules") + //include(":AzureSample") //project(':AzureSample').projectDir = new File('azuresample/app')