Browse Source

update experimental/examples/falling-balls (#2486)

pull/2487/head
dima.avdeev 2 years ago committed by GitHub
parent
commit
e900f561f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      experimental/examples/falling-balls-mpp/androidApp/build.gradle.kts
  2. 2
      experimental/examples/falling-balls-mpp/build.gradle.kts
  3. 91
      experimental/examples/falling-balls-mpp/gradlew.bat
  4. 10
      experimental/examples/falling-balls-mpp/shared/build.gradle.kts

13
experimental/examples/falling-balls-mpp/androidApp/build.gradle.kts

@ -11,18 +11,18 @@ kotlin {
dependencies { dependencies {
implementation(project(":shared")) implementation(project(":shared"))
implementation("androidx.appcompat:appcompat:1.5.1") implementation("androidx.appcompat:appcompat:1.5.1")
implementation("androidx.activity:activity-compose:1.5.0") implementation("androidx.activity:activity-compose:1.6.1")
} }
} }
} }
} }
android { android {
compileSdkVersion(32) compileSdk = 33
defaultConfig { defaultConfig {
applicationId = "org.jetbrains.FallingBalls" applicationId = "org.jetbrains.FallingBalls"
minSdkVersion(24) minSdk = 24
targetSdkVersion(32) targetSdk = 33
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = "1.0"
} }
@ -30,9 +30,4 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
} }
buildTypes {
getByName("release") {
isMinifyEnabled = false
}
}
} }

2
experimental/examples/falling-balls-mpp/build.gradle.kts

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
classpath("com.android.tools.build:gradle:7.0.4") classpath("com.android.tools.build:gradle:7.3.1")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.2.1") classpath("org.jetbrains.compose:compose-gradle-plugin:1.2.1")
} }
} }

91
experimental/examples/falling-balls-mpp/gradlew.bat vendored

@ -0,0 +1,91 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

10
experimental/examples/falling-balls-mpp/shared/build.gradle.kts

@ -41,7 +41,9 @@ kotlin {
podfile = project.file("../iosApp/Podfile") podfile = project.file("../iosApp/Podfile")
framework { framework {
baseName = "shared" baseName = "shared"
isStatic = true
} }
extraSpecAttributes["resources"] = "['src/commonMain/resources/**', 'src/iosMain/resources/**']"
} }
sourceSets { sourceSets {
@ -60,7 +62,7 @@ kotlin {
} }
val androidMain by getting { val androidMain by getting {
dependencies { dependencies {
implementation("com.google.android.material:material:1.5.0") implementation("com.google.android.material:material:1.7.0")
} }
} }
val androidTest by getting { val androidTest by getting {
@ -96,11 +98,11 @@ kotlin {
} }
android { android {
compileSdkVersion(32) compileSdk = 33
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig { defaultConfig {
minSdkVersion(24) minSdk = 24
targetSdkVersion(32) targetSdk = 33
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8

Loading…
Cancel
Save