Skip to content

Commit 2f700a5

Browse files
committed
Updated dependencies & fixed some warnings
1 parent 3a2f220 commit 2f700a5

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ android {
3737
}
3838

3939
dependencies {
40-
implementation 'androidx.appcompat:appcompat:1.3.0'
41-
implementation 'androidx.core:core-ktx:1.5.0'
40+
implementation 'androidx.appcompat:appcompat:1.3.1'
41+
implementation 'androidx.core:core-ktx:1.6.0'
4242
implementation 'com.github.romainguy:kotlin-math:main'
43-
implementation 'com.google.android.material:material:1.3.0'
43+
implementation 'com.google.android.material:material:1.4.0'
4444
implementation 'de.javagl:obj:0.3.0'
4545
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
4646
}

app/src/main/AndroidManifest.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
android:label="@string/app_name"
1414
android:supportsRtl="true"
1515
android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
16-
<activity android:name=".view.ContentActivity">
16+
<activity
17+
android:name=".view.ContentActivity"
18+
android:exported="true">
1719
<intent-filter>
1820
<action android:name="android.intent.action.MAIN" />
1921
<category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/net/pters/learnopengl/android/scenes/inpractice/breakout/Ball.kt

-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,4 @@ class Ball(
3838

3939
return position
4040
}
41-
42-
fun reset(position: Float2, velocity: Float2) {
43-
44-
}
4541
}

app/src/main/java/net/pters/learnopengl/android/scenes/inpractice/breakout/ResourceManager.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ResourceManager(private val contextProvider: ContextProvider) {
1212

1313
private val programs = mutableMapOf<String, Program>()
1414

15-
val sounds = mutableMapOf<String, MediaPlayer>()
15+
private val sounds = mutableMapOf<String, MediaPlayer>()
1616

1717
private val textures = mutableMapOf<String, Texture>()
1818

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.5.0'
3+
ext.kotlin_version = '1.5.21'
44

55
repositories {
66
google()
77
mavenCentral()
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:4.2.1'
11+
classpath 'com.android.tools.build:gradle:7.0.0'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313

1414
// NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

+1-1
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.7.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

0 commit comments

Comments
 (0)