Skip to content

Commit 6d6408e

Browse files
colemancdacolemancda
committed
Updated for Swift 5.7
1 parent 94c7013 commit 6d6408e

22 files changed

+149
-150
lines changed

‎Sources/Android/AppCompatActivity.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ open class SwiftSupportAppCompatActivity: AndroidContextWrapper {
267267

268268
withJavaObject {
269269

270-
var __return = JNIMethod.CallObjectMethod(object: $0,
270+
let __return = JNIMethod.CallObjectMethod(object: $0,
271271
methodName: "startService",
272272
methodSig: "(Landroid/content/Intent;)Landroid/content/ComponentName;",
273273
methodCache: &SwiftActivityJNICache.MethodID.startService,

‎Sources/Android/ContentIntent.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public extension Android.Content.Intent {
301301
* Add extended data to the intent. (int)
302302
*/
303303
@discardableResult
304-
public func putExtra(name: String, value: Int) -> Android.Content.Intent {
304+
func putExtra(name: String, value: Int) -> Android.Content.Intent {
305305
var __locals = [jobject]()
306306

307307
var __args: [jvalue] = [
@@ -349,7 +349,7 @@ public extension Android.Content.Intent {
349349
* Add extended data to the intent. (int[])
350350
*/
351351
@discardableResult
352-
public func putExtra(name: String, value: [Int]) -> Android.Content.Intent {
352+
func putExtra(name: String, value: [Int]) -> Android.Content.Intent {
353353

354354
var __locals = [jobject]()
355355

@@ -374,7 +374,7 @@ public extension Android.Content.Intent {
374374
* Add extended data to the intent. (String)
375375
*/
376376
@discardableResult
377-
public func putExtra(name: String, value: String) -> Android.Content.Intent {
377+
func putExtra(name: String, value: String) -> Android.Content.Intent {
378378

379379
var __locals = [jobject]()
380380

@@ -396,7 +396,7 @@ public extension Android.Content.Intent {
396396
}
397397

398398
@discardableResult
399-
public func putExtra(name: String, value: [String]) -> Android.Content.Intent {
399+
func putExtra(name: String, value: [String]) -> Android.Content.Intent {
400400

401401
var __locals = [jobject]()
402402

@@ -418,7 +418,7 @@ public extension Android.Content.Intent {
418418
}
419419

420420
@discardableResult
421-
public func setType(_ type: String) -> Android.Content.Intent {
421+
func setType(_ type: String) -> Android.Content.Intent {
422422

423423
var __locals = [jobject]()
424424

@@ -438,7 +438,7 @@ public extension Android.Content.Intent {
438438
return Android.Content.Intent(javaObject: __return)
439439
}
440440

441-
public static func createChooser(intent: AndroidIntent, title: String) throws -> AndroidIntent {
441+
static func createChooser(intent: AndroidIntent, title: String) throws -> AndroidIntent {
442442

443443
var __locals = [jobject]()
444444

‎Sources/Android/ContentIntentFilter.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public extension Android.Content.IntentFilter {
120120
/**
121121
* Add a new Intent action to match against.
122122
*/
123-
public func addAction( _ action: String) {
123+
func addAction( _ action: String) {
124124
var __locals = [jobject]()
125125

126126
var __args: [jvalue] = [
@@ -138,7 +138,7 @@ public extension Android.Content.IntentFilter {
138138
/**
139139
* Add a new Intent action to match against.
140140
*/
141-
public func getAction(index: Int) -> String {
141+
func getAction(index: Int) -> String {
142142
var __locals = [jobject]()
143143

144144
var __args: [jvalue] = [

‎Sources/Android/ContentPmPackageManager.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public final class AndroidPackageManager: JavaObject {
6666

6767
internal extension AndroidPackageManager {
6868

69-
internal static var PERMISSION_DENIED: Int {
69+
static var PERMISSION_DENIED: Int {
7070

7171
get {
7272

@@ -81,7 +81,7 @@ internal extension AndroidPackageManager {
8181
}
8282
}
8383

84-
internal static var PERMISSION_GRANTED: Int {
84+
static var PERMISSION_GRANTED: Int {
8585

8686
get {
8787

‎Sources/Android/ContentResResources.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class AndroidContentResResources: JavaObject {
3939

4040
public extension AndroidContentResResources {
4141

42-
public func getDisplayMetrics() -> Android.Util.DisplayMetrics? {
42+
func getDisplayMetrics() -> Android.Util.DisplayMetrics? {
4343

4444
var __locals = [jobject]()
4545

@@ -58,7 +58,7 @@ public extension AndroidContentResResources {
5858
return __return != nil ? Android.Util.DisplayMetrics(javaObject: __return) : nil
5959
}
6060

61-
public func getIdentifier(name: String, type: String, defPackage: String) -> Int {
61+
func getIdentifier(name: String, type: String, defPackage: String) -> Int {
6262

6363
var __locals = [jobject]()
6464

‎Sources/Android/ContextCompat.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ open class AndroidContextCompat: JavaObject {
3030

3131
public extension AndroidContextCompat {
3232

33-
public static func getColor(context: AndroidContext, colorRes: Int) -> Int64 {
33+
static func getColor(context: AndroidContext, colorRes: Int) -> Int64 {
3434

3535
var __locals = [jobject]()
3636

@@ -49,7 +49,7 @@ public extension AndroidContextCompat {
4949
return Int64(__return)
5050
}
5151

52-
public static func getDrawable(context: AndroidContext, drawableRes: Int) -> AndroidGraphicsDrawableDrawable? {
52+
static func getDrawable(context: AndroidContext, drawableRes: Int) -> AndroidGraphicsDrawableDrawable? {
5353

5454
var __locals = [jobject]()
5555

‎Sources/Android/Dialog.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ open class AndroidDialog: JavaObject {
8282

8383
public extension AndroidDialog {
8484

85-
public func cancel() {
85+
func cancel() {
8686

8787
var __locals = [jobject]()
8888

@@ -97,7 +97,7 @@ public extension AndroidDialog {
9797
locals: &__locals )
9898
}
9999

100-
public func dismiss() {
100+
func dismiss() {
101101

102102
var __locals = [jobject]()
103103

@@ -134,7 +134,7 @@ public extension AndroidDialog {
134134
return AndroidWindow(javaObject: __return)
135135
}
136136

137-
public func findViewById(_ id: Int) -> Android.View.View? {
137+
func findViewById(_ id: Int) -> Android.View.View? {
138138

139139
var __locals = [jobject]()
140140

@@ -155,7 +155,7 @@ public extension AndroidDialog {
155155
return __return != nil ? Android.View.View(javaObject: __return) : nil
156156
}
157157

158-
public func getContext() -> AndroidContext {
158+
func getContext() -> AndroidContext {
159159

160160
var __locals = [jobject]()
161161

@@ -176,7 +176,7 @@ public extension AndroidDialog {
176176
return AndroidContext(javaObject: __return)
177177
}
178178

179-
public func setCancelable(cancelable: Bool) {
179+
func setCancelable(cancelable: Bool) {
180180

181181
var __locals = [jobject]()
182182

@@ -192,7 +192,7 @@ public extension AndroidDialog {
192192
locals: &__locals )
193193
}
194194

195-
public func setContentView(view: AndroidView) {
195+
func setContentView(view: AndroidView) {
196196

197197
var __locals = [jobject]()
198198

@@ -208,7 +208,7 @@ public extension AndroidDialog {
208208
locals: &__locals )
209209
}
210210

211-
public func show() {
211+
func show() {
212212

213213
var __locals = [jobject]()
214214

@@ -224,7 +224,7 @@ public extension AndroidDialog {
224224
}
225225

226226
@discardableResult
227-
public func requestWindowFeature(featureId: Int) -> Bool {
227+
func requestWindowFeature(featureId: Int) -> Bool {
228228

229229
var __locals = [jobject]()
230230

‎Sources/Android/DrawableCompat.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ open class AndroidDrawableCompat: JavaObject {
3030

3131
public extension AndroidDrawableCompat {
3232

33-
public static func wrap(drawable: AndroidGraphicsDrawableDrawable) -> AndroidGraphicsDrawableDrawable {
33+
static func wrap(drawable: AndroidGraphicsDrawableDrawable) -> AndroidGraphicsDrawableDrawable {
3434

3535
var __locals = [jobject]()
3636

@@ -49,7 +49,7 @@ public extension AndroidDrawableCompat {
4949
return AndroidGraphicsDrawableDrawable(javaObject: __return)
5050
}
5151

52-
public static func setTint(drawable: AndroidGraphicsDrawableDrawable, color: Int64){
52+
static func setTint(drawable: AndroidGraphicsDrawableDrawable, color: Int64){
5353

5454
var __locals = [jobject]()
5555

@@ -68,7 +68,7 @@ public extension AndroidDrawableCompat {
6868

6969
}
7070

71-
public static func setTint(drawable: AndroidGraphicsDrawableDrawable, colorRes: Int){
71+
static func setTint(drawable: AndroidGraphicsDrawableDrawable, colorRes: Int){
7272

7373
var __locals = [jobject]()
7474

‎Sources/Android/FullScreenDialogFragment.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public extension AndroidFullScreenDialogFragment {
146146

147147
// MARK: - Responder
148148

149-
public func show(manager: JavaObject, tag: String) {
149+
func show(manager: JavaObject, tag: String) {
150150

151151
var __locals = [jobject]()
152152

‎Sources/Android/GraphicsColor.swift‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class AndroidGraphicsColor: JavaObject {
5252

5353
public extension AndroidGraphicsColor {
5454

55-
public static var BLACK: Int64 {
55+
static var BLACK: Int64 {
5656

5757
get {
5858

@@ -67,7 +67,7 @@ public extension AndroidGraphicsColor {
6767
}
6868
}
6969

70-
public static var DKGRAY: Int64 {
70+
static var DKGRAY: Int64 {
7171

7272
get {
7373

@@ -82,7 +82,7 @@ public extension AndroidGraphicsColor {
8282
}
8383
}
8484

85-
public static var GRAY: Int64 {
85+
static var GRAY: Int64 {
8686

8787
get {
8888

@@ -97,7 +97,7 @@ public extension AndroidGraphicsColor {
9797
}
9898
}
9999

100-
public static var LTGRAY: Int64 {
100+
static var LTGRAY: Int64 {
101101

102102
get {
103103

@@ -112,7 +112,7 @@ public extension AndroidGraphicsColor {
112112
}
113113
}
114114

115-
public static var WHITE: Int64 {
115+
static var WHITE: Int64 {
116116

117117
get {
118118

@@ -127,7 +127,7 @@ public extension AndroidGraphicsColor {
127127
}
128128
}
129129

130-
public static var RED: Int64 {
130+
static var RED: Int64 {
131131

132132
get {
133133

@@ -142,7 +142,7 @@ public extension AndroidGraphicsColor {
142142
}
143143
}
144144

145-
public static var GREEN: Int64 {
145+
static var GREEN: Int64 {
146146

147147
get {
148148

@@ -157,7 +157,7 @@ public extension AndroidGraphicsColor {
157157
}
158158
}
159159

160-
public static var BLUE: Int64 {
160+
static var BLUE: Int64 {
161161

162162
get {
163163

@@ -172,7 +172,7 @@ public extension AndroidGraphicsColor {
172172
}
173173
}
174174

175-
public static var YELLOW: Int64 {
175+
static var YELLOW: Int64 {
176176

177177
get {
178178

@@ -187,7 +187,7 @@ public extension AndroidGraphicsColor {
187187
}
188188
}
189189

190-
public static var CYAN: Int64 {
190+
static var CYAN: Int64 {
191191

192192
get {
193193

@@ -202,7 +202,7 @@ public extension AndroidGraphicsColor {
202202
}
203203
}
204204

205-
public static var MAGENTA: Int64 {
205+
static var MAGENTA: Int64 {
206206

207207
get {
208208

@@ -217,7 +217,7 @@ public extension AndroidGraphicsColor {
217217
}
218218
}
219219

220-
public static var TRANSPARENT: Int64 {
220+
static var TRANSPARENT: Int64 {
221221

222222
get {
223223

@@ -235,7 +235,7 @@ public extension AndroidGraphicsColor {
235235

236236
public extension AndroidGraphicsColor {
237237

238-
public static func valueOf(color: Int) -> Android.Graphics.Color {
238+
static func valueOf(color: Int) -> Android.Graphics.Color {
239239

240240
var __locals = [jobject]()
241241

@@ -257,7 +257,7 @@ public extension AndroidGraphicsColor {
257257

258258
/*
259259
/// Return a color-int from alpha, red, green, blue components.
260-
public static func argb(alpha: Int, red: Int, green: Int, blue: Int) -> Int {
260+
static func argb(alpha: Int, red: Int, green: Int, blue: Int) -> Int {
261261

262262
var __locals = [jobject]()
263263

@@ -283,7 +283,7 @@ public extension AndroidGraphicsColor {
283283
* The original (FFFF)I just is supported over api 26.
284284
* Return a color-int from alpha, red, green, blue float components in the range [0..1].
285285
*/
286-
public static func argb(alpha: Float, red: Float, green: Float, blue: Float) -> Int64 {
286+
static func argb(alpha: Float, red: Float, green: Float, blue: Float) -> Int64 {
287287

288288
var __locals = [jobject]()
289289

0 commit comments

Comments
 (0)