Updates, migrate to kts

build.gradle.kts

@@ -0,0 +1,24 @@
+buildscript {
+    repositories {
+        maven("https://plugins.gradle.org/m2/")
+        maven("https://repo1.maven.org/maven2/")
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
+        classpath("com.android.tools.build:gradle:7.0.4")
+    }
+}
+
+rootProject.ext["currentVersion"] = "0.5-ios15"
+rootProject.ext["kotlin_version"] = "1.6.21"
+
+allprojects {
+    repositories {
+        maven("https://plugins.gradle.org/m2/")
+        maven("https://repo1.maven.org/maven2/")
+        google()
+        mavenCentral()
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sat Apr 23 23:43:13 CEST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

kgl-android/build.gradle.kts

@@ -0,0 +1,59 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("maven-publish")
+}
+
+android {
+    compileSdkVersion(31)
+
+    defaultConfig {
+        minSdkVersion(21)
+        targetSdkVersion(31)
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+            //proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    sourceSets {
+        getByName("main") {
+            java.srcDir("src/main/kotlin")
+        }
+    }
+}
+
+val kotlinVersion = rootProject.ext["kotlin_version"] as String
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
+
+    implementation(project(":kgl"))
+}
+
+
+afterEvaluate {
+    publishing {
+        publications {
+            create<MavenPublication>("maven") {
+                from(project.components["release"])
+
+                groupId = "com.danielgergely.kgl"
+                artifactId = "kgl-android"
+                version = rootProject.ext["currentVersion"] as String
+
+            }
+        }
+    }
+}

kgl-android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.danielgergely.kgl_android"/>
+<manifest package="com.danielgergely.kgl_android" />

kgl-ios/build.gradle.kts

@@ -11,10 +11,6 @@ repositories {
 }
 
 kotlin {
-    /* Targets configuration omitted. 
-    *  To find out how to configure the targets, please follow the link:
-    *  https://kotlinlang.org/docs/reference/building-mpp-with-gradle.html#setting-up-targets */
-
     iosArm64()
     iosX64()
 
@@ -43,3 +39,7 @@ kotlin {
         }
     }
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+}

kgl-ios/src/nativeMain/kotlin/com.danielgergely.kgl/KglIos.kt

@@ -28,14 +28,15 @@ private object VirtualStack : NativePlacement {
     }
 }
 
+@OptIn(ExperimentalUnsignedTypes::class)
 object KglIos : Kgl {
 
     override fun createShader(type: Int): Shader? {
         val shader = glCreateShader(type.toUInt()).toInt()
         return if (shader == 0) null else shader
     }
 
-    fun glShaderSource(shader: UInt, strings: List<String>) {
+    private fun glShaderSource(shader: UInt, strings: List<String>) {
         VirtualStack.push()
         try {
             val input = VirtualStack.allocArray<CPointerVar<ByteVar>>(strings.size) {
@@ -146,7 +147,6 @@ object KglIos : Kgl {
         return createBuffers(1)[0]
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     override fun createBuffers(count: Int): Array<GlBuffer> {
         val buffers = UIntArray(count)
         buffers.usePinned {
@@ -163,10 +163,9 @@ object KglIos : Kgl {
         glBufferData(target.toUInt(), size.toLong(), sourceData.ref(), usage.toUInt())
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     override fun deleteBuffer(buffer: GlBuffer) {
         val buffers = uintArrayOf(buffer.toUInt())
-        buffers.usePinned { it
+        buffers.usePinned {
             glDeleteBuffers(1, it.addressOf(0))
         }
     }
@@ -179,7 +178,14 @@ object KglIos : Kgl {
         stride: Int,
         offset: Int
     ) {
-        glVertexAttribPointer(location.toUInt(), size, type.toUInt(), normalized.toGl(), stride, offset.toLong().toCPointer<COpaque>())
+        glVertexAttribPointer(
+            location.toUInt(),
+            size,
+            type.toUInt(),
+            normalized.toGl(),
+            stride,
+            offset.toLong().toCPointer<COpaque>()
+        )
     }
 
     override fun uniform1f(location: UniformLocation, f: Float) {
@@ -250,7 +256,6 @@ object KglIos : Kgl {
         return createTextures(1)[0]
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     override fun createTextures(n: Int): Array<Texture> {
         val textures = UIntArray(n)
         textures.usePinned {
@@ -261,7 +266,7 @@ object KglIos : Kgl {
 
     override fun deleteTexture(texture: Texture) {
         val textures = uintArrayOf(texture.toUInt())
-        textures.usePinned { it
+        textures.usePinned {
             glDeleteTextures(1, it.addressOf(0))
         }
     }
@@ -324,7 +329,6 @@ object KglIos : Kgl {
         glTexParameteri(target.toUInt(), pname.toUInt(), value)
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     override fun createVertexArray(): VertexArrayObject {
         val buffer = UIntArray(1)
         buffer.usePinned {
@@ -341,7 +345,6 @@ object KglIos : Kgl {
         }
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     override fun deleteVertexArray(vertexArrayObject: VertexArrayObject) {
         val buffer = uintArrayOf(vertexArrayObject.toUInt())
         buffer.usePinned {
@@ -369,7 +372,6 @@ object KglIos : Kgl {
         }
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     override fun createFramebuffer(): Framebuffer {
         val buffer = UIntArray(1)
         buffer.usePinned {
@@ -378,7 +380,6 @@ object KglIos : Kgl {
         return buffer[0].toInt()
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     override fun deleteFramebuffer(framebuffer: Framebuffer) {
         val buffer = uintArrayOf(framebuffer.toUInt())
         buffer.usePinned {
@@ -406,7 +407,6 @@ object KglIos : Kgl {
         }
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     override fun createRenderbuffer(): Renderbuffer {
         val buffer = UIntArray(1)
         buffer.usePinned {
@@ -428,7 +428,12 @@ object KglIos : Kgl {
         renderbuffertarget: Int,
         renderbuffer: Renderbuffer
     ) {
-        glFramebufferRenderbuffer(target.toUInt(), attachment.toUInt(), renderbuffertarget.toUInt(), renderbuffer.toUInt())
+        glFramebufferRenderbuffer(
+            target.toUInt(),
+            attachment.toUInt(),
+            renderbuffertarget.toUInt(),
+            renderbuffer.toUInt()
+        )
     }
 
     override fun isRenderbuffer(renderbuffer: Renderbuffer): Boolean {