diff --git a/glean-core/ios/sdk_generator.sh b/glean-core/ios/sdk_generator.sh index a5cbc5c2d4..bab0660d6d 100755 --- a/glean-core/ios/sdk_generator.sh +++ b/glean-core/ios/sdk_generator.sh @@ -153,7 +153,7 @@ VENVDIR="${SOURCE_ROOT}/.venv" # We need at least pip 20.3 for Big Sur support, see https://pip.pypa.io/en/stable/news/#id48 # Latest pip is 21.0.1 "${VENVDIR}"/bin/pip install "pip>=20.3" -"${VENVDIR}"/bin/pip install --upgrade glean_parser==$GLEAN_PARSER_VERSION +"${VENVDIR}"/bin/pip install --upgrade "git+ssh://git@github.com/badboy/glean_parser@build-date#egg=glean-parser" # Run the glinter # Turn its warnings into warnings visible in Xcode (but don't do for the success message) diff --git a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy index a3417e84c2..b5fa0555cf 100644 --- a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy +++ b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy @@ -66,25 +66,6 @@ module_name = sys.argv[2] expected_version = sys.argv[3] try: module = importlib.import_module(module_name) -except ImportError: - found_version = None -else: - found_version = getattr(module, '__version__') -if found_version != expected_version: - if not offline: - subprocess.check_call([ - sys.executable, - '-m', - 'pip', - 'install', - '--upgrade', - f'{module_name}=={expected_version}' - ]) - else: - print(f'Using Python environment at {sys.executable},') - print(f'expected glean_parser version {expected_version}, found {found_version}.') - sys.exit(1) -try: subprocess.check_call([ sys.executable, '-m', @@ -433,7 +414,7 @@ except: // Setup a miniconda environment. conda is used because it works // non-interactively on Windows, unlike the standard Python installers - conda "Miniconda3", "Miniconda3-${MINICONDA_VERSION}", "64", ["glean_parser==${GLEAN_PARSER_VERSION}"] + conda "Miniconda3", "Miniconda3-${MINICONDA_VERSION}", "64", ["git+ssh://git@github.com/badboy/glean_parser@build-date#egg=glean-parser"] } File envDir = new File( condaBootstrapDir, @@ -503,7 +484,7 @@ except: // Print the required glean_parser version to the console. This is // offline builds, and is mentioned in the documentation for offline // builds. - println("Requires glean_parser==${GLEAN_PARSER_VERSION}") + println("Requires glean_parser==git") File envDir = setupPythonEnvironmentTasks(project) // Store in both gleanCondaDir (for backward compatibility reasons) and diff --git a/samples/ios/app/Cartfile b/samples/ios/app/Cartfile index 27e7cb3e3d..bdb1a60c58 100644 --- a/samples/ios/app/Cartfile +++ b/samples/ios/app/Cartfile @@ -1,3 +1,3 @@ github "httpswift/swifter" "1.5.0" github "1024jp/GzipSwift" "5.1.1" -github "mozilla/glean" "main" +github "badboy/glean" "with-build-date"