diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d512f26..9e291c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,10 +19,10 @@ jobs: - uses: actions/checkout@v3 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' - name: Create local.properties diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b63314..6da1b83 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..371f2e2 --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 9f47dfb..639c779 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,15 @@ diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index d60e118..51f4dfa 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,13 @@ -# Overview +# overview Kotlin未経験で、Android Javaでアプリ開発したい人向けのテンプレートプロジェクト
productFlavorsでテンプレートを切り替える仕組みにしています。
使い方など、詳しいことは以下のWikiにまとめています。
https://github.com/LeoAndo/AndroidBasicApp/wiki
+# develop environment +Android Studio Meerkat + # capture: Light Theme ## pixel3a API 30 diff --git a/app/build.gradle b/app/build.gradle index 49f0c9b..dd6b9d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,6 +60,7 @@ android { buildFeatures { viewBinding true + buildConfig true } flavorDimensions += "version" diff --git a/app/src/main/java/com/template/androidbasicapp/ui/fragment/UiDemoFragment.java b/app/src/main/java/com/template/androidbasicapp/ui/fragment/UiDemoFragment.java index cc1788a..bd1816a 100644 --- a/app/src/main/java/com/template/androidbasicapp/ui/fragment/UiDemoFragment.java +++ b/app/src/main/java/com/template/androidbasicapp/ui/fragment/UiDemoFragment.java @@ -15,7 +15,6 @@ import android.widget.ArrayAdapter; import com.google.android.material.snackbar.Snackbar; -import com.template.androidbasicapp.AppLogger; import com.template.androidbasicapp.BuildConfig; import com.template.androidbasicapp.R; import com.template.androidbasicapp.data.Item; @@ -28,7 +27,6 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; diff --git a/build.gradle b/build.gradle index 0e07323..465593e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } } plugins { - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '8.7.3' apply false + id 'com.android.library' version '8.7.3' apply false id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1251b7b..b2f6d22 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Oct 19 18:40:28 JST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME