Skip to content

Commit 320ee03

Browse files
natario1natario1
authored
Upgrade to Kotlin 1.4.21, release v0.5.4 (#31)
* Upgrade to Kotlin 1.4.21, release v0.5.4 * master > main * Fix demo
1 parent 6277ec1 commit 320ee03

File tree

11 files changed

+62
-37
lines changed

11 files changed

+62
-37
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Build
44
on:
55
push:
66
branches:
7-
- master
7+
- main
88
pull_request:
99
jobs:
1010
ANDROID_BASE_CHECKS:

‎.run/publishAllDirectory.run.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="publishAllDirectory" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$/library" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="publishAllDirectory" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" value="" />
17+
</ExternalSystemSettings>
18+
<GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
19+
<method v="2" />
20+
</configuration>
21+
</component>

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ but other targets like iOS can probably be added easily.
3838

3939
```kotlin
4040
// Regular Android projects
41-
implementation("com.otaliastudios.opengl:egloo-android:0.5.3")
41+
implementation("com.otaliastudios.opengl:egloo-android:0.5.4")
4242

4343
// Kotlin Multiplatform projects: add egloo-multiplatform to your common source set.
44-
implementation("com.otaliastudios.opengl:egloo-multiplatform:0.5.3")
44+
implementation("com.otaliastudios.opengl:egloo-multiplatform:0.5.4")
4545

4646
// Kotlin Multiplatform projects: or use the granular dependencies:
47-
implementation("com.otaliastudios.opengl:egloo-android:0.5.3") // Android AAR
48-
implementation("com.otaliastudios.opengl:egloo-androidnativex86:0.5.3") // Android Native KLib
49-
implementation("com.otaliastudios.opengl:egloo-androidnativex64:0.5.3") // Android Native KLib
50-
implementation("com.otaliastudios.opengl:egloo-androidnativearm32:0.5.3") // Android Native KLib
51-
implementation("com.otaliastudios.opengl:egloo-androidnativearm64:0.5.3") // Android Native KLib
47+
implementation("com.otaliastudios.opengl:egloo-android:0.5.4") // Android AAR
48+
implementation("com.otaliastudios.opengl:egloo-androidnativex86:0.5.4") // Android Native KLib
49+
implementation("com.otaliastudios.opengl:egloo-androidnativex64:0.5.4") // Android Native KLib
50+
implementation("com.otaliastudios.opengl:egloo-androidnativearm32:0.5.4") // Android Native KLib
51+
implementation("com.otaliastudios.opengl:egloo-androidnativearm64:0.5.4") // Android Native KLib
5252
```
5353

5454
## Features

‎build.gradle.kts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
buildscript {
22
extra["androidMinSdkVersion"] = 18
3-
extra["androidCompileSdkVersion"] = 29
4-
extra["androidTargetSdkVersion"] = 29
3+
extra["androidCompileSdkVersion"] = 30
4+
extra["androidTargetSdkVersion"] = 30
55

66
repositories {
77
google()
88
mavenCentral()
99
jcenter()
10+
mavenLocal()
1011
}
1112

1213
dependencies {
13-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
14-
classpath("com.android.tools.build:gradle:4.0.1")
15-
classpath("com.otaliastudios.tools:publisher:0.3.3")
14+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
15+
classpath("com.android.tools.build:gradle:4.1.1")
16+
classpath("io.deepmedia.tools:publisher:0.4.1")
1617
}
1718
}
1819

‎demo/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
setCompileSdkVersion(property("androidCompileSdkVersion") as Int)
99

1010
defaultConfig {
11-
applicationId = "com.otaliastudios.zoom.demo"
11+
applicationId = "com.otaliastudios.opengl.demo"
1212
setMinSdkVersion(property("androidMinSdkVersion") as Int)
1313
setTargetSdkVersion(property("androidTargetSdkVersion") as Int)
1414
versionCode = 1
@@ -22,8 +22,8 @@ android {
2222
}
2323

2424
dependencies {
25-
implementation("androidx.appcompat:appcompat:1.1.0")
26-
implementation("androidx.core:core-ktx:1.1.0")
25+
implementation("androidx.appcompat:appcompat:1.2.0")
26+
implementation("androidx.core:core-ktx:1.3.2")
2727
implementation("com.google.android.exoplayer:exoplayer-core:2.10.4")
2828
implementation("com.google.android.exoplayer:exoplayer-ui:2.10.4")
2929
implementation(project(":library"))

‎demo/src/main/java/com/otaliastudios/opengl/demo/ShapesActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ class ShapesActivity : AppCompatActivity() {
5353
surfaceView.setZOrderOnTop(true)
5454
surfaceView.holder.setFormat(PixelFormat.RGBA_8888)
5555
surfaceView.holder.addCallback(object : SurfaceHolder.Callback {
56-
override fun surfaceCreated(holder: SurfaceHolder?) {
56+
override fun surfaceCreated(holder: SurfaceHolder) {
5757
onSurfaceCreated()
5858
}
5959

60-
override fun surfaceChanged(holder: SurfaceHolder?, format: Int, width: Int, height: Int) {
60+
override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
6161
GLES20.glViewport(0, 0, width, height)
6262
scene.setViewportSize(width, height)
6363
}
6464

65-
override fun surfaceDestroyed(holder: SurfaceHolder?) {
65+
override fun surfaceDestroyed(holder: SurfaceHolder) {
6666
onSurfaceDestroyed()
6767
}
6868
})
@@ -145,7 +145,7 @@ class ShapesActivity : AppCompatActivity() {
145145
return true
146146
}
147147

148-
override fun onOptionsItemSelected(item: MenuItem?): Boolean {
148+
override fun onOptionsItemSelected(item: MenuItem): Boolean {
149149
startActivity(Intent(this, VideoActivity::class.java))
150150
onSurfaceDestroyed()
151151
finish()

‎demo/src/main/java/com/otaliastudios/opengl/demo/VideoActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ class VideoActivity : AppCompatActivity(), GLSurfaceView.Renderer {
9292
glSurfaceView.setRenderer(this)
9393
glSurfaceView.renderMode = GLSurfaceView.RENDERMODE_WHEN_DIRTY
9494
glSurfaceView.holder.addCallback(object : SurfaceHolder.Callback {
95-
override fun surfaceCreated(holder: SurfaceHolder?) {}
96-
override fun surfaceChanged(holder: SurfaceHolder?, format: Int, width: Int, height: Int) {}
97-
override fun surfaceDestroyed(holder: SurfaceHolder?) {
95+
override fun surfaceCreated(holder: SurfaceHolder) {}
96+
override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {}
97+
override fun surfaceDestroyed(holder: SurfaceHolder) {
9898
onSurfaceDestroyed()
9999
}
100100
})
@@ -198,7 +198,7 @@ class VideoActivity : AppCompatActivity(), GLSurfaceView.Renderer {
198198
return true
199199
}
200200

201-
override fun onOptionsItemSelected(item: MenuItem?): Boolean {
201+
override fun onOptionsItemSelected(item: MenuItem): Boolean {
202202
startActivity(Intent(this, ShapesActivity::class.java))
203203
onSurfaceDestroyed()
204204
finish()

‎docs/_about/changelog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ New versions are released through GitHub, so the reference page is the [GitHub R
99
Starting from v0.3.1, you can [support development](https://github.com/sponsors/natario1) through the GitHub Sponsors program.
1010
Companies can share a tiny part of their revenue and get private support hours in return. Thanks!
1111

12+
### v0.5.4
13+
14+
- Upgrade to Kotlin 1.4.21 ([#31][31])
15+
1216
### v0.5.3
1317

1418
- New: Upgrade to Kotlin 1.4 ([#27][27])

‎docs/_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ google_analytics_id: 'UA-155077779-3'
1212
google_site_verification: '4x49i17ABIrSvUl52SeL0-t0341aTnWWaC62-FYCRT4'
1313
github: [metadata] # TODO What's this?
1414
github_repo: Egloo
15-
github_version: 0.5.3
15+
github_version: 0.5.4
1616
github_branch: master
1717
baseurl: '/Egloo' # Keep as an empty string if served up at the root
1818
collections:

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip

0 commit comments

Comments
 (0)