@capgo/camera-preview 4.0.0 → 5.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (133) hide show
  1. package/README.md +22 -30
  2. package/android/.gradle/8.0.2/checksums/checksums.lock +0 -0
  3. package/android/.gradle/8.0.2/dependencies-accessors/dependencies-accessors.lock +0 -0
  4. package/android/.gradle/8.0.2/dependencies-accessors/gc.properties +0 -0
  5. package/android/.gradle/8.0.2/executionHistory/executionHistory.bin +0 -0
  6. package/android/.gradle/8.0.2/executionHistory/executionHistory.lock +0 -0
  7. package/android/.gradle/8.0.2/fileChanges/last-build.bin +0 -0
  8. package/android/.gradle/8.0.2/fileHashes/fileHashes.bin +0 -0
  9. package/android/.gradle/8.0.2/fileHashes/fileHashes.lock +0 -0
  10. package/android/.gradle/8.0.2/fileHashes/resourceHashesCache.bin +0 -0
  11. package/android/.gradle/8.0.2/gc.properties +0 -0
  12. package/android/.gradle/8.2.1/checksums/checksums.lock +0 -0
  13. package/android/.gradle/8.2.1/dependencies-accessors/dependencies-accessors.lock +0 -0
  14. package/android/.gradle/8.2.1/dependencies-accessors/gc.properties +0 -0
  15. package/android/.gradle/8.2.1/executionHistory/executionHistory.bin +0 -0
  16. package/android/.gradle/8.2.1/executionHistory/executionHistory.lock +0 -0
  17. package/android/.gradle/8.2.1/fileChanges/last-build.bin +0 -0
  18. package/android/.gradle/8.2.1/fileHashes/fileHashes.bin +0 -0
  19. package/android/.gradle/8.2.1/fileHashes/fileHashes.lock +0 -0
  20. package/android/.gradle/8.2.1/gc.properties +0 -0
  21. package/android/.gradle/8.7/checksums/checksums.lock +0 -0
  22. package/android/.gradle/8.7/dependencies-accessors/gc.properties +0 -0
  23. package/android/.gradle/8.7/executionHistory/executionHistory.bin +0 -0
  24. package/android/.gradle/8.7/executionHistory/executionHistory.lock +0 -0
  25. package/android/.gradle/8.7/fileChanges/last-build.bin +0 -0
  26. package/android/.gradle/8.7/fileHashes/fileHashes.bin +0 -0
  27. package/android/.gradle/8.7/fileHashes/fileHashes.lock +0 -0
  28. package/android/.gradle/8.7/fileHashes/resourceHashesCache.bin +0 -0
  29. package/android/.gradle/8.7/gc.properties +0 -0
  30. package/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  31. package/android/.gradle/buildOutputCleanup/cache.properties +2 -0
  32. package/android/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  33. package/android/.gradle/file-system.probe +0 -0
  34. package/android/.gradle/vcs-1/gc.properties +0 -0
  35. package/android/build.gradle +1 -1
  36. package/android/gradle/wrapper/gradle-wrapper.jar +0 -0
  37. package/android/gradle/wrapper/gradle-wrapper.properties +1 -0
  38. package/android/gradlew +17 -12
  39. package/android/gradlew.bat +10 -10
  40. package/android/src/main/java/com/ahm/capacitor/camera/preview/CameraActivity.java +219 -219
  41. package/android/src/main/java/com/ahm/capacitor/camera/preview/CameraPreview.java +108 -85
  42. package/android/src/main/java/com/ahm/capacitor/camera/preview/CustomSurfaceView.java +4 -3
  43. package/android/src/main/java/com/ahm/capacitor/camera/preview/CustomTextureView.java +5 -5
  44. package/android/src/main/java/com/ahm/capacitor/camera/preview/Preview.java +44 -23
  45. package/dist/docs.json +29 -22
  46. package/dist/esm/definitions.d.ts +6 -2
  47. package/dist/esm/definitions.js.map +1 -1
  48. package/dist/esm/index.d.ts +2 -2
  49. package/dist/esm/index.js +4 -4
  50. package/dist/esm/index.js.map +1 -1
  51. package/dist/esm/web.d.ts +2 -2
  52. package/dist/esm/web.js +44 -45
  53. package/dist/esm/web.js.map +1 -1
  54. package/dist/plugin.cjs.js +45 -46
  55. package/dist/plugin.cjs.js.map +1 -1
  56. package/dist/plugin.js +45 -46
  57. package/dist/plugin.js.map +1 -1
  58. package/ios/Plugin/CameraController.swift +35 -14
  59. package/ios/Plugin/Plugin.swift +25 -26
  60. package/ios/Plugin.xcodeproj/xcuserdata/martindonadieu.xcuserdatad/xcschemes/xcschememanagement.plist +14 -0
  61. package/ios/Plugin.xcworkspace/xcuserdata/martindonadieu.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  62. package/ios/PluginTests/PluginTests.swift +61 -13
  63. package/ios/Podfile.lock +3 -3
  64. package/ios/Pods/CapacitorCordova/LICENSE +23 -0
  65. package/ios/Pods/CapacitorCordova/README.md +39 -0
  66. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/CapacitorCordova.h +21 -0
  67. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/AppDelegate.h +8 -0
  68. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/AppDelegate.m +5 -0
  69. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDV.h +28 -0
  70. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVAvailability.h +109 -0
  71. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVCommandDelegate.h +51 -0
  72. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVCommandDelegateImpl.h +39 -0
  73. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVCommandDelegateImpl.m +154 -0
  74. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVConfigParser.h +31 -0
  75. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVConfigParser.m +81 -0
  76. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVInvokedUrlCommand.h +52 -0
  77. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVInvokedUrlCommand.m +116 -0
  78. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPlugin.h +81 -0
  79. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPlugin.m +154 -0
  80. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPluginManager.h +25 -0
  81. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPluginManager.m +77 -0
  82. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPluginResult.h +82 -0
  83. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPluginResult.m +216 -0
  84. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVScreenOrientationDelegate.h +33 -0
  85. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVUIWebViewDelegate.h +41 -0
  86. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVUIWebViewDelegate.m +399 -0
  87. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVURLProtocol.h +27 -0
  88. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVURLProtocol.m +74 -0
  89. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVUserAgentUtil.h +27 -0
  90. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVUserAgentUtil.m +156 -0
  91. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVViewController.h +30 -0
  92. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/CDVViewController.m +34 -0
  93. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/NSDictionary+CordovaPreferences.h +35 -0
  94. package/ios/Pods/CapacitorCordova/ios/CapacitorCordova/CapacitorCordova/Classes/Public/NSDictionary+CordovaPreferences.m +63 -0
  95. package/ios/Pods/Local Podspecs/Capacitor.podspec.json +31 -0
  96. package/ios/Pods/Manifest.lock +23 -0
  97. package/ios/Pods/Pods.xcodeproj/project.pbxproj +1489 -0
  98. package/ios/Pods/Pods.xcodeproj/xcuserdata/martindonadieu.xcuserdatad/xcschemes/Capacitor.xcscheme +58 -0
  99. package/ios/Pods/Pods.xcodeproj/xcuserdata/martindonadieu.xcuserdatad/xcschemes/CapacitorCordova.xcscheme +58 -0
  100. package/ios/Pods/Pods.xcodeproj/xcuserdata/martindonadieu.xcuserdatad/xcschemes/Pods-Plugin.xcscheme +58 -0
  101. package/ios/Pods/Pods.xcodeproj/xcuserdata/martindonadieu.xcuserdatad/xcschemes/Pods-PluginTests.xcscheme +58 -0
  102. package/ios/Pods/Pods.xcodeproj/xcuserdata/martindonadieu.xcuserdatad/xcschemes/xcschememanagement.plist +39 -0
  103. package/ios/Pods/Target Support Files/Capacitor/Capacitor-Info.plist +26 -0
  104. package/ios/Pods/Target Support Files/Capacitor/Capacitor-dummy.m +5 -0
  105. package/ios/Pods/Target Support Files/Capacitor/Capacitor-prefix.pch +12 -0
  106. package/ios/Pods/Target Support Files/Capacitor/Capacitor.debug.xcconfig +16 -0
  107. package/ios/Pods/Target Support Files/Capacitor/Capacitor.modulemap +8 -0
  108. package/ios/Pods/Target Support Files/Capacitor/Capacitor.release.xcconfig +16 -0
  109. package/ios/Pods/Target Support Files/CapacitorCordova/CapacitorCordova-Info.plist +26 -0
  110. package/ios/Pods/Target Support Files/CapacitorCordova/CapacitorCordova-dummy.m +5 -0
  111. package/ios/Pods/Target Support Files/CapacitorCordova/CapacitorCordova-prefix.pch +12 -0
  112. package/ios/Pods/Target Support Files/CapacitorCordova/CapacitorCordova-umbrella.h +32 -0
  113. package/ios/Pods/Target Support Files/CapacitorCordova/CapacitorCordova.debug.xcconfig +13 -0
  114. package/ios/Pods/Target Support Files/CapacitorCordova/CapacitorCordova.modulemap +6 -0
  115. package/ios/Pods/Target Support Files/CapacitorCordova/CapacitorCordova.release.xcconfig +13 -0
  116. package/ios/Pods/Target Support Files/Pods-Plugin/Pods-Plugin-Info.plist +26 -0
  117. package/ios/Pods/Target Support Files/Pods-Plugin/Pods-Plugin-acknowledgements.markdown +55 -0
  118. package/ios/Pods/Target Support Files/Pods-Plugin/Pods-Plugin-acknowledgements.plist +93 -0
  119. package/ios/Pods/Target Support Files/Pods-Plugin/Pods-Plugin-dummy.m +5 -0
  120. package/ios/Pods/Target Support Files/Pods-Plugin/Pods-Plugin-umbrella.h +16 -0
  121. package/ios/Pods/Target Support Files/Pods-Plugin/Pods-Plugin.debug.xcconfig +14 -0
  122. package/ios/Pods/Target Support Files/Pods-Plugin/Pods-Plugin.modulemap +6 -0
  123. package/ios/Pods/Target Support Files/Pods-Plugin/Pods-Plugin.release.xcconfig +14 -0
  124. package/ios/Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests-Info.plist +26 -0
  125. package/ios/Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests-acknowledgements.markdown +55 -0
  126. package/ios/Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests-acknowledgements.plist +93 -0
  127. package/ios/Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests-dummy.m +5 -0
  128. package/ios/Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests-frameworks.sh +188 -0
  129. package/ios/Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests-umbrella.h +16 -0
  130. package/ios/Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests.debug.xcconfig +15 -0
  131. package/ios/Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests.modulemap +6 -0
  132. package/ios/Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests.release.xcconfig +15 -0
  133. package/package.json +41 -48
package/README.md CHANGED
@@ -11,7 +11,7 @@
11
11
  </p>
12
12
  <br>
13
13
 
14
- This plugin is compatible Capacitor 4 only.
14
+ This plugin is compatible Capacitor 6 and above.
15
15
 
16
16
  **PR's are greatly appreciated.**
17
17
 
@@ -55,6 +55,9 @@ Open `android/app/src/main/AndroidManifest.xml` and above the closing `</manifes
55
55
 
56
56
  ```xml
57
57
  <uses-permission android:name="android.permission.CAMERA" />
58
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
59
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
60
+
58
61
  ```
59
62
 
60
63
  For more help consult the [Capacitor docs](https://capacitorjs.com/docs/android/configuration#configuring-androidmanifestxml).
@@ -93,7 +96,7 @@ Add `import '@capgo/camera-preview'` to you entry script in ionic on `app.module
93
96
  ### start(...)
94
97
 
95
98
  ```typescript
96
- start(options: CameraPreviewOptions) => any
99
+ start(options: CameraPreviewOptions) => Promise<void>
97
100
  ```
98
101
 
99
102
  Start the camera preview instance.
@@ -102,8 +105,6 @@ Start the camera preview instance.
102
105
  | ------------- | --------------------------------------------------------------------- | -------------------------------------------- |
103
106
  | **`options`** | <code><a href="#camerapreviewoptions">CameraPreviewOptions</a></code> | the options to start the camera preview with |
104
107
 
105
- **Returns:** <code>any</code>
106
-
107
108
  **Since:** 0.0.1
108
109
 
109
110
  --------------------
@@ -112,13 +113,11 @@ Start the camera preview instance.
112
113
  ### stop()
113
114
 
114
115
  ```typescript
115
- stop() => any
116
+ stop() => Promise<void>
116
117
  ```
117
118
 
118
119
  Stop the camera preview instance.
119
120
 
120
- **Returns:** <code>any</code>
121
-
122
121
  **Since:** 0.0.1
123
122
 
124
123
  --------------------
@@ -127,7 +126,7 @@ Stop the camera preview instance.
127
126
  ### capture(...)
128
127
 
129
128
  ```typescript
130
- capture(options: CameraPreviewPictureOptions) => any
129
+ capture(options: CameraPreviewPictureOptions) => Promise<{ value: string; }>
131
130
  ```
132
131
 
133
132
  Switch camera.
@@ -136,7 +135,7 @@ Switch camera.
136
135
  | ------------- | ----------------------------------------------------------------------------------- | ------------------------------------- |
137
136
  | **`options`** | <code><a href="#camerapreviewpictureoptions">CameraPreviewPictureOptions</a></code> | the options to switch the camera with |
138
137
 
139
- **Returns:** <code>any</code>
138
+ **Returns:** <code>Promise&lt;{ value: string; }&gt;</code>
140
139
 
141
140
  **Since:** 0.0.1
142
141
 
@@ -146,7 +145,7 @@ Switch camera.
146
145
  ### captureSample(...)
147
146
 
148
147
  ```typescript
149
- captureSample(options: CameraSampleOptions) => any
148
+ captureSample(options: CameraSampleOptions) => Promise<{ value: string; }>
150
149
  ```
151
150
 
152
151
  Capture a sample image.
@@ -155,7 +154,7 @@ Capture a sample image.
155
154
  | ------------- | ------------------------------------------------------------------- | -------------------------------------------- |
156
155
  | **`options`** | <code><a href="#camerasampleoptions">CameraSampleOptions</a></code> | the options to capture the sample image with |
157
156
 
158
- **Returns:** <code>any</code>
157
+ **Returns:** <code>Promise&lt;{ value: string; }&gt;</code>
159
158
 
160
159
  **Since:** 0.0.1
161
160
 
@@ -165,12 +164,12 @@ Capture a sample image.
165
164
  ### getSupportedFlashModes()
166
165
 
167
166
  ```typescript
168
- getSupportedFlashModes() => any
167
+ getSupportedFlashModes() => Promise<{ result: CameraPreviewFlashMode[]; }>
169
168
  ```
170
169
 
171
170
  Get supported flash modes.
172
171
 
173
- **Returns:** <code>any</code>
172
+ **Returns:** <code>Promise&lt;{ result: CameraPreviewFlashMode[]; }&gt;</code>
174
173
 
175
174
  **Since:** 0.0.1
176
175
 
@@ -180,12 +179,12 @@ Get supported flash modes.
180
179
  ### getHorizontalFov()
181
180
 
182
181
  ```typescript
183
- getHorizontalFov() => any
182
+ getHorizontalFov() => Promise<{ result: any; }>
184
183
  ```
185
184
 
186
185
  Get horizontal field of view.
187
186
 
188
- **Returns:** <code>any</code>
187
+ **Returns:** <code>Promise&lt;{ result: any; }&gt;</code>
189
188
 
190
189
  **Since:** 0.0.1
191
190
 
@@ -195,7 +194,7 @@ Get horizontal field of view.
195
194
  ### setFlashMode(...)
196
195
 
197
196
  ```typescript
198
- setFlashMode(options: { flashMode: CameraPreviewFlashMode | string; }) => any
197
+ setFlashMode(options: { flashMode: CameraPreviewFlashMode | string; }) => Promise<void>
199
198
  ```
200
199
 
201
200
  Set flash mode.
@@ -204,8 +203,6 @@ Set flash mode.
204
203
  | ------------- | ----------------------------------- | -------------------------------------- |
205
204
  | **`options`** | <code>{ flashMode: string; }</code> | the options to set the flash mode with |
206
205
 
207
- **Returns:** <code>any</code>
208
-
209
206
  **Since:** 0.0.1
210
207
 
211
208
  --------------------
@@ -214,13 +211,11 @@ Set flash mode.
214
211
  ### flip()
215
212
 
216
213
  ```typescript
217
- flip() => any
214
+ flip() => Promise<void>
218
215
  ```
219
216
 
220
217
  Flip camera.
221
218
 
222
- **Returns:** <code>any</code>
223
-
224
219
  **Since:** 0.0.1
225
220
 
226
221
  --------------------
@@ -229,7 +224,7 @@ Flip camera.
229
224
  ### setOpacity(...)
230
225
 
231
226
  ```typescript
232
- setOpacity(options: CameraOpacityOptions) => any
227
+ setOpacity(options: CameraOpacityOptions) => Promise<void>
233
228
  ```
234
229
 
235
230
  Set opacity.
@@ -238,8 +233,6 @@ Set opacity.
238
233
  | ------------- | --------------------------------------------------------------------- | ------------------------------------------ |
239
234
  | **`options`** | <code><a href="#cameraopacityoptions">CameraOpacityOptions</a></code> | the options to set the camera opacity with |
240
235
 
241
- **Returns:** <code>any</code>
242
-
243
236
  **Since:** 0.0.1
244
237
 
245
238
  --------------------
@@ -248,12 +241,12 @@ Set opacity.
248
241
  ### stopRecordVideo()
249
242
 
250
243
  ```typescript
251
- stopRecordVideo() => any
244
+ stopRecordVideo() => Promise<{ videoFilePath: string; }>
252
245
  ```
253
246
 
254
247
  Stop recording video.
255
248
 
256
- **Returns:** <code>any</code>
249
+ **Returns:** <code>Promise&lt;{ videoFilePath: string; }&gt;</code>
257
250
 
258
251
  **Since:** 0.0.1
259
252
 
@@ -263,7 +256,7 @@ Stop recording video.
263
256
  ### startRecordVideo(...)
264
257
 
265
258
  ```typescript
266
- startRecordVideo(options: CameraPreviewOptions) => any
259
+ startRecordVideo(options: CameraPreviewOptions) => Promise<void>
267
260
  ```
268
261
 
269
262
  Start recording video.
@@ -272,8 +265,6 @@ Start recording video.
272
265
  | ------------- | --------------------------------------------------------------------- | ----------------------------------------- |
273
266
  | **`options`** | <code><a href="#camerapreviewoptions">CameraPreviewOptions</a></code> | the options to start recording video with |
274
267
 
275
- **Returns:** <code>any</code>
276
-
277
268
  **Since:** 0.0.1
278
269
 
279
270
  --------------------
@@ -303,6 +294,7 @@ Start recording video.
303
294
  | **`lockAndroidOrientation`** | <code>boolean</code> | Android Only - Locks device orientation when camera is showing. |
304
295
  | **`enableOpacity`** | <code>boolean</code> | Defaults to false - Android and Web only. Set if camera preview can change opacity. |
305
296
  | **`enableZoom`** | <code>boolean</code> | Defaults to false - Android only. Set if camera preview will support pinch to zoom. |
297
+ | **`cameraMode`** | <code>boolean</code> | default to false - IOS only. Set the CameraPreview to use the video mode preset |
306
298
 
307
299
 
308
300
  #### CameraPreviewPictureOptions
@@ -346,4 +338,4 @@ Start recording video.
346
338
 
347
339
  <code>"off" | "on" | "auto" | "red-eye" | "torch"</code>
348
340
 
349
- </docgen-api>
341
+ </docgen-api>
File without changes
File without changes
File without changes
@@ -0,0 +1,2 @@
1
+ #Wed May 08 17:35:47 WEST 2024
2
+ gradle.version=8.0.2
File without changes
@@ -48,7 +48,7 @@ dependencies {
48
48
  implementation fileTree(dir: 'libs', include: ['*.jar'])
49
49
  implementation project(':capacitor-android')
50
50
  implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
51
- implementation 'androidx.exifinterface:exifinterface:1.3.6'
51
+ implementation 'androidx.exifinterface:exifinterface:1.3.7'
52
52
  testImplementation "junit:junit:$junitVersion"
53
53
  androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
54
54
  androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
@@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
2
2
  distributionPath=wrapper/dists
3
3
  distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
4
4
  networkTimeout=10000
5
+ validateDistributionUrl=true
5
6
  zipStoreBase=GRADLE_USER_HOME
6
7
  zipStorePath=wrapper/dists
package/android/gradlew CHANGED
@@ -83,10 +83,8 @@ done
83
83
  # This is normally unused
84
84
  # shellcheck disable=SC2034
85
85
  APP_BASE_NAME=${0##*/}
86
- APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87
-
88
- # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89
- DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86
+ # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87
+ APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
90
88
 
91
89
  # Use the maximum available, or set MAX_FD != -1 to use that value.
92
90
  MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
133
131
  fi
134
132
  else
135
133
  JAVACMD=java
136
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134
+ if ! command -v java >/dev/null 2>&1
135
+ then
136
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137
137
 
138
138
  Please set the JAVA_HOME variable in your environment to match the
139
139
  location of your Java installation."
140
+ fi
140
141
  fi
141
142
 
142
143
  # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144
145
  case $MAX_FD in #(
145
146
  max*)
146
147
  # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147
- # shellcheck disable=SC3045
148
+ # shellcheck disable=SC2039,SC3045
148
149
  MAX_FD=$( ulimit -H -n ) ||
149
150
  warn "Could not query maximum file descriptor limit"
150
151
  esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
152
153
  '' | soft) :;; #(
153
154
  *)
154
155
  # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155
- # shellcheck disable=SC3045
156
+ # shellcheck disable=SC2039,SC3045
156
157
  ulimit -n "$MAX_FD" ||
157
158
  warn "Could not set maximum file descriptor limit to $MAX_FD"
158
159
  esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
197
198
  done
198
199
  fi
199
200
 
200
- # Collect all arguments for the java command;
201
- # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202
- # shell script including quotes and variable substitutions, so put them in
203
- # double quotes to make sure that they get re-expanded; and
204
- # * put everything else in single quotes, so that it's not re-expanded.
201
+
202
+ # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203
+ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204
+
205
+ # Collect all arguments for the java command:
206
+ # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207
+ # and any embedded shellness will be escaped.
208
+ # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209
+ # treated as '${Hostname}' itself on the command line.
205
210
 
206
211
  set -- \
207
212
  "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
43
43
  %JAVA_EXE% -version >NUL 2>&1
44
44
  if %ERRORLEVEL% equ 0 goto execute
45
45
 
46
- echo.
47
- echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48
- echo.
49
- echo Please set the JAVA_HOME variable in your environment to match the
50
- echo location of your Java installation.
46
+ echo. 1>&2
47
+ echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48
+ echo. 1>&2
49
+ echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50
+ echo location of your Java installation. 1>&2
51
51
 
52
52
  goto fail
53
53
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
57
57
 
58
58
  if exist "%JAVA_EXE%" goto execute
59
59
 
60
- echo.
61
- echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62
- echo.
63
- echo Please set the JAVA_HOME variable in your environment to match the
64
- echo location of your Java installation.
60
+ echo. 1>&2
61
+ echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62
+ echo. 1>&2
63
+ echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64
+ echo location of your Java installation. 1>&2
65
65
 
66
66
  goto fail
67
67