WIP updating code to 0.14

Author: pfgithub

Sdk.zig

@@ -895,7 +895,7 @@ pub fn compileAppLibrary(
 
     // exe.addIncludePath(include_dir);
 
-    exe.addLibraryPath(sdk.b.path(lib_dir));
+    exe.addLibraryPath(.{ .cwd_relative = lib_dir });
 
     // exe.addIncludePath(include_dir);
     // exe.addIncludePath(system_include_dir);

examples/egl/main.zig

@@ -74,7 +74,7 @@ pub const AndroidApp = struct {
     /// Uninitialize the application.
     /// Don't forget to stop your background thread here!
     pub fn deinit(self: *Self) void {
-        @atomicStore(bool, &self.running, false, .SeqCst);
+        @atomicStore(bool, &self.running, false, .seq_cst);
         if (self.thread) |thread| {
             thread.join();
             self.thread = null;
@@ -413,7 +413,7 @@ pub const AndroidApp = struct {
             1.0, 1.0,
         };
 
-        while (@atomicLoad(bool, &self.running, .SeqCst)) {
+        while (@atomicLoad(bool, &self.running, .seq_cst)) {
 
             // Input process
             {
@@ -846,18 +846,18 @@ const Oscillator = struct {
     amplitude: f64 = 0.1,
 
     fn setWaveOn(self: *@This(), isWaveOn: bool) void {
-        @atomicStore(bool, &self.isWaveOn, isWaveOn, .SeqCst);
+        @atomicStore(bool, &self.isWaveOn, isWaveOn, .seq_cst);
     }
 
     fn setSampleRate(self: *@This(), sample_rate: i32) void {
         self.phaseIncrement = (std.math.tau * self.frequency) / @as(f64, @floatFromInt(sample_rate));
     }
 
     fn renderf32(self: *@This(), audio_data: []f32) void {
-        if (!@atomicLoad(bool, &self.isWaveOn, .SeqCst)) self.phase = 0;
+        if (!@atomicLoad(bool, &self.isWaveOn, .seq_cst)) self.phase = 0;
 
         for (audio_data) |*frame| {
-            if (@atomicLoad(bool, &self.isWaveOn, .SeqCst)) {
+            if (@atomicLoad(bool, &self.isWaveOn, .seq_cst)) {
                 frame.* += @as(f32, @floatCast(std.math.sin(self.phase) * self.amplitude));
                 self.phase += self.phaseIncrement;
                 if (self.phase > std.math.tau) self.phase -= std.math.tau;
@@ -866,10 +866,10 @@ const Oscillator = struct {
     }
 
     fn renderi16(self: *@This(), audio_data: []i16) void {
-        if (!@atomicLoad(bool, &self.isWaveOn, .SeqCst)) self.phase = 0;
+        if (!@atomicLoad(bool, &self.isWaveOn, .seq_cst)) self.phase = 0;
 
         for (audio_data) |*frame| {
-            if (@atomicLoad(bool, &self.isWaveOn, .SeqCst)) {
+            if (@atomicLoad(bool, &self.isWaveOn, .seq_cst)) {
                 frame.* +|= @as(i16, @intFromFloat(@as(f32, @floatCast(std.math.sin(self.phase) * self.amplitude)) * std.math.maxInt(i16)));
                 self.phase += self.phaseIncrement;
                 if (self.phase > std.math.tau) self.phase -= std.math.tau;

src/android-support.zig

@@ -101,14 +101,14 @@ var recursive_panic = false;
 pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace, _: ?usize) noreturn {
     var logger = LogWriter{ .log_level = android.ANDROID_LOG_ERROR };
 
-    if (@atomicLoad(bool, &recursive_panic, .SeqCst)) {
+    if (@atomicLoad(bool, &recursive_panic, .seq_cst)) {
         logger.writer().print("RECURSIVE PANIC: {s}\n", .{message}) catch {};
         while (true) {
             std.time.sleep(std.time.ns_per_week);
         }
     }
 
-    @atomicStore(bool, &recursive_panic, true, .SeqCst);
+    @atomicStore(bool, &recursive_panic, true, .seq_cst);
 
     logger.writer().print("PANIC: {s}\n", .{message}) catch {};
 
@@ -140,7 +140,7 @@ pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace, _: ?usi
 
     logger.writer().writeAll("<-- end of stack trace -->\n") catch {};
 
-    std.os.exit(1);
+    std.process.exit(1);
 }
 
 const LogWriter = struct {
@@ -231,9 +231,9 @@ fn makeNativeActivityGlue(comptime App: type) android.ANativeActivityCallbacks {
                 if (activity.instance) |instance| {
                     const result = @call(.auto, @field(App, func), .{@as(*App, @ptrCast(@alignCast(instance)))} ++ args);
                     switch (@typeInfo(@TypeOf(result))) {
-                        .ErrorUnion => result catch |err| app_log.err("{s} returned error {s}", .{ func, @errorName(err) }),
-                        .Void => {},
-                        .ErrorSet => app_log.err("{s} returned error {s}", .{ func, @errorName(result) }),
+                        .error_union => result catch |err| app_log.err("{s} returned error {s}", .{ func, @errorName(err) }),
+                        .void => {},
+                        .error_set => app_log.err("{s} returned error {s}", .{ func, @errorName(result) }),
                         else => @compileError("callback must return void!"),
                     }
                 }
@@ -329,7 +329,7 @@ fn makeNativeActivityGlue(comptime App: type) android.ANativeActivityCallbacks {
     };
 }
 
-inline fn printSymbolInfoAt(st_index: usize, maybe_debug_info: ?*std.debug.DebugInfo, int_addr: usize) void {
+inline fn printSymbolInfoAt(st_index: usize, maybe_debug_info: ?*std.debug.SelfInfo, int_addr: usize) void {
     var symbol_name_buffer: [1024]u8 = undefined;
     var symbol_name: ?[]const u8 = null;
 
@@ -346,9 +346,9 @@ inline fn printSymbolInfoAt(st_index: usize, maybe_debug_info: ?*std.debug.Debug
                     &symbol_name_buffer,
                     "{s} {s} {s}",
                     .{
-                        symbol.symbol_name,
+                        symbol.name,
                         symbol.compile_unit_name,
-                        fmtMaybeLineInfo(symbol.line_info),
+                        fmtMaybeLineInfo(symbol.source_location),
                     },
                 ) catch symbol_name;
             } else |_| {}
@@ -362,7 +362,7 @@ inline fn printSymbolInfoAt(st_index: usize, maybe_debug_info: ?*std.debug.Debug
     });
 }
 
-fn realFmtMaybeLineInfo(self: ?std.debug.LineInfo, comptime fmt: []const u8, options: std.fmt.FormatOptions, writer: anytype) !void {
+fn realFmtMaybeLineInfo(self: ?std.debug.SourceLocation, comptime fmt: []const u8, options: std.fmt.FormatOptions, writer: anytype) !void {
     _ = fmt;
     _ = options;
     if (self) |li| {
@@ -376,7 +376,7 @@ fn realFmtMaybeLineInfo(self: ?std.debug.LineInfo, comptime fmt: []const u8, opt
     }
 }
 
-fn fmtMaybeLineInfo(li: ?std.debug.LineInfo) std.fmt.Formatter(realFmtMaybeLineInfo) {
+fn fmtMaybeLineInfo(li: ?std.debug.SourceLocation) std.fmt.Formatter(realFmtMaybeLineInfo) {
     return std.fmt.Formatter(realFmtMaybeLineInfo){
         .data = li,
     };

src/jni.zig

@@ -10,8 +10,8 @@ const android = @import("android-support.zig");
 pub const JNI = opaque {
     // Underlying implementation
     fn JniReturnType(comptime function: @TypeOf(.literal)) type {
-        @setEvalBranchQuota(10_000);
-        return @typeInfo(@typeInfo(std.meta.fieldInfo(android.JNINativeInterface, function).type).Pointer.child).Fn.return_type.?;
+        @setEvalBranchQuota(100_000);
+        return @typeInfo(@typeInfo(std.meta.fieldInfo(android.JNINativeInterface, function).type).pointer.child).@"fn".return_type.?;
     }
 
     pub inline fn invokeJniNoException(jni: *JNI, comptime function: @TypeOf(.literal), args: anytype) JniReturnType(function) {