Merge pull request #19 from openziti/build-updates

ekoby · web-flow · commit ec64ac6dc4a0 · 2023-07-05T15:51:49.000-04:00
update Android SDK and gradle plugin versions
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -1,8 +1,9 @@
 name: CI build
 
 on:
+  workflow_dispatch:
   push:
-    branches: ['*']
+    branches: ['main']
   pull_request:
     branches: ['main']
 
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -1,6 +1,7 @@
 name: Publish Release
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -14,11 +15,11 @@ jobs:
       BUILD_NUMBER: ${{ github.GITHUB_RUN_NUMBER }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin
diff --git a/build.gradle b/build.gradle
@@ -20,8 +20,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.0")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")
+        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
     }
 
     ext.versions = [
@@ -102,9 +102,9 @@ subprojects {
         mavenCentral()
     }
 
-    tasks.withType(PublishToMavenRepository).all {
-        onlyIf { !semver.info.dirty }
-    }
+//    tasks.withType(PublishToMavenRepository).all {
+//        onlyIf { !semver.info.dirty }
+//    }
 }
 
 nexusPublishing {
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 kotlin.code.style=official
 
diff --git a/publish.gradle b/publish.gradle
@@ -44,9 +44,9 @@ project.plugins.withType(MavenPublishPlugin).all {
 
             developers {
                 developer {
-                    id = "advdev"
-                    name = "NetFoundry Advanced Development Team"
-                    email = "adv-dev@netfoundry.io"
+                    id = "devs"
+                    name = "OpenZiti Development Team"
+                    email = "developers@openziti.org"
                 }
             }
 
diff --git a/ziti-android/build.gradle b/ziti-android/build.gradle
@@ -18,7 +18,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.github.kezong:fat-aar:1.3.8'
+//        classpath 'com.github.kezong:fat-aar:1.3.8'
     }
 }
 
@@ -29,19 +29,19 @@ plugins {
     id 'maven-publish'
 }
 
-apply plugin: 'com.kezong.fat-aar'
+//apply plugin: 'com.kezong.fat-aar'
 
 ext {
     description "Ziti SDK for Android"
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     ndkVersion "21.3.6528147"
 
     defaultConfig {
         minSdkVersion 26
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
 
         buildConfigField "String", "GIT_COMMIT", "\"${semver.info.shortCommit}\""
@@ -81,8 +81,8 @@ dependencies {
         exclude module:"lazysodium-java"
         exclude module:"jna"
     }
-    embed("com.goterl:lazysodium-android:${versions.lazysodiumAndroid}@aar")
-    embed('net.java.dev.jna:jna:5.12.1@aar')
+    api("com.goterl:lazysodium-android:${versions.lazysodiumAndroid}@aar")
+    api('net.java.dev.jna:jna:5.12.1@aar')
 
     implementation deps.kotlin
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
diff --git a/ziti-android/src/main/java/org/openziti/android/InfoProviders.kt b/ziti-android/src/main/java/org/openziti/android/InfoProviders.kt
@@ -79,7 +79,7 @@ class AppInfoProvider: DebugInfoProvider {
         output.appendLine("Android-SDK:     ${Build.VERSION.SDK_INT}")
         output.appendLine("Ziti Version:    ${BuildConfig.ZITI_VERSION}(${Version.revision})")
         output.appendLine("App:             ${Ziti.app.packageName}")
-        output.appendLine("App Version:     ${Ziti.app.packageManager.getPackageInfo(Ziti.app.packageName, 0).versionName}")
+        output.appendLine("App Version:     ${Ziti.getAppVersion()}")
     }
 }
 
diff --git a/ziti-android/src/main/java/org/openziti/android/Ziti.kt b/ziti-android/src/main/java/org/openziti/android/Ziti.kt
@@ -32,7 +32,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.openziti.ZitiContext
 import org.openziti.net.dns.DNSResolver
@@ -104,7 +103,7 @@ object Ziti: CoroutineScope, Logged by ZitiLog() {
         })
 
         val appId = app.packageName
-        val appVer = app.packageManager.getPackageInfo(appId, 0).versionName
+        val appVer = getAppVersion()
         org.openziti.Ziti.setApplicationInfo(appId, appVer)
 
         keyStore = KeyStore.getInstance("AndroidKeyStore")
@@ -170,8 +169,9 @@ object Ziti: CoroutineScope, Logged by ZitiLog() {
     }
 
     fun enrollZiti(jwtUri: Uri) {
-        val jwt = app.contentResolver.openInputStream(jwtUri)!!.readBytes()
-        enrollZiti(jwt)
+        app.contentResolver.openInputStream(jwtUri)?.use {
+            enrollZiti(it.readBytes())
+        }
     }
 
     fun enrollZiti(jwt: ByteArray) {
@@ -203,11 +203,11 @@ object Ziti: CoroutineScope, Logged by ZitiLog() {
 
     fun sendFeedbackIntent() = Intent(Intent.ACTION_SEND).apply {
         type = "application/zip"
-        putExtra(Intent.EXTRA_EMAIL, arrayOf("support@netfoundry.io"))
+        putExtra(Intent.EXTRA_EMAIL, arrayOf("developers@openziti.org"))
         putExtra(Intent.EXTRA_SUBJECT, app.getString(R.string.supportEmailSubject))
 
         val identities = Impl.getContexts()
-        val ids = if (identities.isNullOrEmpty()) {
+        val ids = if (identities.isEmpty()) {
             "no enrollments"
         } else {
             identities.joinToString(separator = "\n") {
@@ -216,16 +216,16 @@ object Ziti: CoroutineScope, Logged by ZitiLog() {
         }
 
         val bodyString = """
-                    |Device:          ${Build.MODEL} (${Build.MANUFACTURER})
-                    |Android Version: ${Build.VERSION.RELEASE}
-                    |Android-SDK:     ${Build.VERSION.SDK_INT}
-                    |Ziti Version:    ${BuildConfig.ZITI_VERSION}(${Version.revision})
-                    |App:             ${app.packageName}
-                    |App Version:     ${app.packageManager.getPackageInfo(app.packageName, 0).versionName}
-                    |
-                    |Enrollments:
-                    |${ids}
-                    |""".trimMargin()
+                        |Device:          ${Build.MODEL} (${Build.MANUFACTURER})
+                        |Android Version: ${Build.VERSION.RELEASE}
+                        |Android-SDK:     ${Build.VERSION.SDK_INT}
+                        |Ziti Version:    ${BuildConfig.ZITI_VERSION}(${Version.revision})
+                        |App:             ${app.packageName}
+                        |App Version:     ${getAppVersion()}
+                        |
+                        |Enrollments:
+                        |${ids}
+                        |""".trimMargin()
 
         putExtra(Intent.EXTRA_TEXT, bodyString)
 
@@ -255,8 +255,12 @@ object Ziti: CoroutineScope, Logged by ZitiLog() {
         zip.flush()
         zip.close()
 
-        putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(app,
-            "${app.packageName}.provider", logFile))
+        putExtra(
+            Intent.EXTRA_STREAM, FileProvider.getUriForFile(
+                app,
+                "${app.packageName}.provider", logFile
+            )
+        )
     }
 
     @JvmStatic
@@ -274,4 +278,9 @@ object Ziti: CoroutineScope, Logged by ZitiLog() {
 
     @JvmStatic
     fun getSSLSocketFactory() = Impl.getSSLSocketFactory()
+
+    fun getAppVersion(): String {
+        val packageInfo = app.packageManager.getPackageInfo(app.packageName, 0)
+        return packageInfo.versionName
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ buildscript {`
`20`	`20`	`google()`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`		`- classpath("com.android.tools.build:gradle:7.3.0")`
`24`		`- classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")`
	`23`	`+ classpath("com.android.tools.build:gradle:7.4.2")`
	`24`	`+ classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`ext.versions = [`
`@@ -102,9 +102,9 @@ subprojects {`
`102`	`102`	`mavenCentral()`
`103`	`103`	`}`
`104`	`104`
`105`		`- tasks.withType(PublishToMavenRepository).all {`
`106`		`- onlyIf { !semver.info.dirty }`
`107`		`- }`
	`105`	`+// tasks.withType(PublishToMavenRepository).all {`
	`106`	`+// onlyIf { !semver.info.dirty }`
	`107`	`+// }`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`nexusPublishing {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8`
	`16`	`+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8`
`17`	`17`
`18`	`18`	`kotlin.code.style=official`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ project.plugins.withType(MavenPublishPlugin).all {`
`44`	`44`
`45`	`45`	`developers {`
`46`	`46`	`developer {`
`47`		`- id = "advdev"`
`48`		`- name = "NetFoundry Advanced Development Team"`
`49`		`- email = "adv-dev@netfoundry.io"`
	`47`	`+ id = "devs"`
	`48`	`+ name = "OpenZiti Development Team"`
	`49`	`+ email = "developers@openziti.org"`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ buildscript {`
`18`	`18`	`mavenCentral()`
`19`	`19`	`}`
`20`	`20`	`dependencies {`
`21`		`- classpath 'com.github.kezong:fat-aar:1.3.8'`
	`21`	`+// classpath 'com.github.kezong:fat-aar:1.3.8'`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`@@ -29,19 +29,19 @@ plugins {`
`29`	`29`	`id 'maven-publish'`
`30`	`30`	`}`
`31`	`31`
`32`		`-apply plugin: 'com.kezong.fat-aar'`
	`32`	`+//apply plugin: 'com.kezong.fat-aar'`
`33`	`33`
`34`	`34`	`ext {`
`35`	`35`	`description "Ziti SDK for Android"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`android {`
`39`		`- compileSdkVersion 31`
	`39`	`+ compileSdkVersion 33`
`40`	`40`	`ndkVersion "21.3.6528147"`
`41`	`41`
`42`	`42`	`defaultConfig {`
`43`	`43`	`minSdkVersion 26`
`44`		`- targetSdkVersion 31`
	`44`	`+ targetSdkVersion 33`
`45`	`45`	`versionCode 1`
`46`	`46`
`47`	`47`	`buildConfigField "String", "GIT_COMMIT", "\"${semver.info.shortCommit}\""`
`@@ -81,8 +81,8 @@ dependencies {`
`81`	`81`	`exclude module:"lazysodium-java"`
`82`	`82`	`exclude module:"jna"`
`83`	`83`	`}`
`84`		`- embed("com.goterl:lazysodium-android:${versions.lazysodiumAndroid}@aar")`
`85`		`- embed('net.java.dev.jna:jna:5.12.1@aar')`
	`84`	`+ api("com.goterl:lazysodium-android:${versions.lazysodiumAndroid}@aar")`
	`85`	`+ api('net.java.dev.jna:jna:5.12.1@aar')`
`86`	`86`
`87`	`87`	`implementation deps.kotlin`
`88`	`88`	`implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class AppInfoProvider: DebugInfoProvider {`
`79`	`79`	`output.appendLine("Android-SDK: ${Build.VERSION.SDK_INT}")`
`80`	`80`	`output.appendLine("Ziti Version: ${BuildConfig.ZITI_VERSION}(${Version.revision})")`
`81`	`81`	`output.appendLine("App: ${Ziti.app.packageName}")`
`82`		`- output.appendLine("App Version: ${Ziti.app.packageManager.getPackageInfo(Ziti.app.packageName, 0).versionName}")`
	`82`	`+ output.appendLine("App Version: ${Ziti.getAppVersion()}")`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`