Merge pull request #23 from OutSystems/development

Merge `development` into `main`
OutSystems · Mar 28, 2024 · cf6afbd · cf6afbd
2 parents 0dc9518 + e21bb03
commit cf6afbd
Show file tree

Hide file tree

Showing 13 changed files with 197 additions and 282 deletions.
diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml
@@ -17,7 +17,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Setup Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '17'
@@ -32,7 +32,7 @@ jobs:
       run: bundle exec fastlane coverage
 
     - name: Setup sonarqube
-      uses: warchant/setup-sonar-scanner@v7
+      uses: warchant/setup-sonar-scanner@v8
 
     - name: Send to Sonarcloud
       run: bundle exec fastlane sonarqube

diff --git a/.gitignore b/.gitignore
@@ -85,3 +85,4 @@ lint/tmp/
 # lint/reports/
 
 .DS_Store
+Gemfile.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ The changes documented here do not include those from the original repository.
 
 ## [Unreleased]
 
+### 26-03-2024
+- Add zoom options (https://outsystemsrd.atlassian.net/browse/RMET-2987).
+
+### 22-02-2024
+- Update `github_actions.yml` file steps versions (https://outsystemsrd.atlassian.net/browse/RMET-2568).
+
 ## [1.0.0]
 
 ### 09-01-2024

diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/docs/LICENSE → LICENSE b/docs/LICENSE → LICENSE
diff --git a/docs/assets/createRepositoryButton.png b/docs/assets/createRepositoryButton.png
diff --git a/docs/assets/repositoryNameExample.png b/docs/assets/repositoryNameExample.png
diff --git a/docs/assets/useThisTemplateButton.png b/docs/assets/useThisTemplateButton.png
diff --git a/pom.xml b/pom.xml
@@ -7,5 +7,5 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.outsystems</groupId>
     <artifactId>osbarcode-android</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 </project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,3 +85,4 @@ lint/tmp/
		# lint/reports/

		.DS_Store
		Gemfile.lock