Skip to content

Commit c01c299

Browse files
committed
fix erosion over time
1 parent 2e0ff4d commit c01c299

File tree

3 files changed

+35
-10
lines changed

3 files changed

+35
-10
lines changed

build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ if (keystorePropertiesFile.exists()) {
77
buildscript {
88
repositories {
99
google()
10-
jcenter()
10+
mavenCentral()
1111
}
1212

1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:4.1.0'
14+
classpath 'com.android.tools.build:gradle:8.3.0'
1515
}
1616
}
1717

@@ -22,7 +22,6 @@ repositories {
2222
maven {
2323
url "https://maven.google.com"
2424
}
25-
jcenter()
2625
}
2726

2827
dependencies {
@@ -33,7 +32,8 @@ dependencies {
3332
}
3433

3534
android {
36-
compileSdkVersion 30
35+
namespace = 'mn.tck.semitone'
36+
compileSdkVersion 34
3737
ndkVersion '22.0.7026061'
3838

3939
lintOptions {
@@ -43,9 +43,9 @@ android {
4343
defaultConfig {
4444
applicationId "mn.tck.semitone"
4545
minSdkVersion 16
46-
targetSdkVersion 30
47-
versionCode 4
48-
versionName "1.3"
46+
targetSdkVersion 34
47+
versionCode 5
48+
versionName "1.3.1"
4949
externalNativeBuild {
5050
cmake {
5151
arguments "-DANDROID_PLATFORM=android-16"

shell.nix

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{ pkgs ? import <nixpkgs> {} }:
2+
with pkgs;
3+
let
4+
buildToolsVersion = "34.0.0";
5+
cmakeVersion = "3.22.1";
6+
androidComposition = androidenv.composeAndroidPackages {
7+
includeEmulator = false;
8+
includeSources = false;
9+
includeSystemImages = false;
10+
useGoogleAPIs = false;
11+
useGoogleTVAddOns = false;
12+
includeNDK = true;
13+
ndkVersions = ["22.0.7026061"];
14+
platformVersions = ["34"];
15+
buildToolsVersions = [buildToolsVersion];
16+
cmakeVersions = [cmakeVersion];
17+
};
18+
in mkShell rec {
19+
ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
20+
ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle";
21+
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${buildToolsVersion}/aapt2";
22+
shellHook = ''
23+
export PATH="$(echo "$ANDROID_SDK_ROOT/cmake/${cmakeVersion}".*/bin):$PATH"
24+
'';
25+
}

src/main/AndroidManifest.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="mn.tck.semitone">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<uses-permission android:name="android.permission.RECORD_AUDIO" />
43
<application android:label="@string/app_name"
54
android:icon="@mipmap/ic_launcher"
65
android:theme="@style/SemitoneTheme"
76
android:allowBackup="true">
87
<activity android:name=".MainActivity"
9-
android:label="@string/app_name">
8+
android:label="@string/app_name"
9+
android:exported="false">
1010
<intent-filter>
1111
<action android:name="android.intent.action.MAIN" />
1212
<category android:name="android.intent.category.LAUNCHER" />

0 commit comments

Comments
 (0)