Minor improvements: release

madduck · Sep 10, 2021 · 25e868b · 25e868b
1 parent 2d5f6d8
commit 25e868b
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 30 deletions.
diff --git a/AndroidManifestBadminton.xml b/AndroidManifestBadminton.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-          package="com.doubleyellow.badminton"
+          package="com.doubleyellow.badminton">
+<!--
           android:versionName="${versionNameBadminton}"
-          android:versionCode="${versionCodePrefix}${versionCodeSuffixBadminton}">
+          android:versionCode="${versionCodePrefix}${versionCodeSuffixBadminton}"
+-->
 <!-- PlayStoreID=4974076001360456618 -->
 
 <!--

diff --git a/AndroidManifestRacketlon.xml b/AndroidManifestRacketlon.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-    package="com.doubleyellow.racketlon"
+    package="com.doubleyellow.racketlon">
+<!--
     android:versionName="${versionNameRacketlon}"
-    android:versionCode="${versionCodePrefix}${versionCodeSuffixRacketlon}">
+    android:versionCode="${versionCodePrefix}${versionCodeSuffixRacketlon}"
+-->
     <!-- PlayStoreID=4973204554147732137 -->
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />

diff --git a/AndroidManifestSquore.xml b/AndroidManifestSquore.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-    package="com.doubleyellow.scoreboard"
+    package="com.doubleyellow.scoreboard">
+<!--
     android:versionName="${versionNameSquore}"
-    android:versionCode="${versionCodePrefix}${versionCodeSuffixSquore}">
+    android:versionCode="${versionCodePrefix}${versionCodeSuffixSquore}"
+-->
     <!-- PlayStoreID=4972255383319852172 -->
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />

diff --git a/AndroidManifestTabletennis.xml b/AndroidManifestTabletennis.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-          package="com.doubleyellow.tabletennis"
+          package="com.doubleyellow.tabletennis">
+<!--
           android:versionName="${versionNameTabletennis}"
-          android:versionCode="${versionCodePrefix}${versionCodeSuffixTabletennis}">
+          android:versionCode="${versionCodePrefix}${versionCodeSuffixTabletennis}"
+-->
     <!-- PlayStoreID=4975506867766261096 -->
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />

diff --git a/AndroidManifestTennisPadel.xml b/AndroidManifestTennisPadel.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-          package="com.doubleyellow.tennispadel"
+          package="com.doubleyellow.tennispadel">
+<!--
           android:versionName="${versionNameTennisPadel}"
-          android:versionCode="${versionCodePrefix}${versionCodeSuffixTennisPadel}">
+          android:versionCode="${versionCodePrefix}${versionCodeSuffixTennisPadel}"
+-->
     <!-- PlayStoreID=4972207514792479457 -->
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />
@@ -81,6 +83,7 @@
         <activity android:name="com.doubleyellow.scoreboard.main.ScoreBoard" android:label="@string/app_name_short_brand__TennisPadel">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
 <!--
@@ -101,7 +104,6 @@
 
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
-                <category android:name="android.intent.category.DEFAULT"/>
                 <!-- mimetype must match the mimetype as passed from com.doubleyellow.scoreboard.main.ScoreBoard.createNdefMessage() -->
 <!--
                 <data android:mimeType="application/com.doubleyellow.scoreboard"/>

diff --git a/build.gradle b/build.gradle
@@ -17,17 +17,17 @@ buildscript {
         jcenter()
     }
     dependencies {
-     classpath 'com.android.tools.build:gradle:3.6.4'
+     //classpath 'com.android.tools.build:gradle:3.6.4'
      //classpath 'com.android.tools.build:gradle:4.0.0' // java.security.NoSuchAlgorithmException: EC KeyFactory not available
      //classpath 'com.android.tools.build:gradle:4.1.0' // java.lang.NumberFormatException: For input string: "${versionCodePrefix}${versionCodeSuffixTennisPadel}"
       //classpath 'com.android.tools.build:gradle:4.1.2' // java.lang.NumberFormatException: For input string: "${versionCodePrefix}${versionCodeSuffixTennisPadel}"
-      //classpath 'com.android.tools.build:gradle:4.1.3' // java.lang.NumberFormatException: For input string: "${versionCodePrefix}${versionCodeSuffixTennisPadel}"
+      classpath 'com.android.tools.build:gradle:4.1.3' // java.lang.NumberFormatException: For input string: "${versionCodePrefix}${versionCodeSuffixTennisPadel}"
     }
 }
 // Run ./gradlew -q :dependencies
 android {
 
-    compileSdkVersion 29
+    compileSdkVersion 30
     // buildToolsVersion not required for gradle 3.0.0 and higher (e.g. when using wrapper)
     //buildToolsVersion '28.0.3'
 
@@ -49,12 +49,14 @@ android {
 
         //testInstrumentationRunner = 'android.support.test.runner.AndroidJUnitRunner'
         //applicationId "com.doubleyellow"
-        manifestPlaceholders = [ versionNameTabletennis: "4.39", versionCodeSuffixTabletennis: "0458"
-                               , versionNameBadminton  : "4.39", versionCodeSuffixBadminton  : "0458"
-                               , versionNameTennisPadel: "4.39", versionCodeSuffixTennisPadel: "0459"
-                               , versionNameSquore     : "4.39", versionCodeSuffixSquore     : "0458"
-                               , versionNameRacketlon  : "4.39", versionCodeSuffixRacketlon  : "0458"
+/*
+        manifestPlaceholders = [ versionNameTabletennis: "4.39", versionCodeSuffixTabletennis: "0461"
+                               , versionNameBadminton  : "4.39", versionCodeSuffixBadminton  : "0461"
+                               , versionNameTennisPadel: "4.39", versionCodeSuffixTennisPadel: "0461"
+                               , versionNameSquore     : "4.39", versionCodeSuffixSquore     : "0462"
+                               , versionNameRacketlon  : "4.39", versionCodeSuffixRacketlon  : "0461"
                                ]
+*/
     }
     sourceSets {
         main {
@@ -95,20 +97,23 @@ android {
             dimension "devicetype"
             minSdkVersion 19
             //targetSdkVersion 28 // if specified to low, google play will reject the APK
-            targetSdkVersion 29
-            manifestPlaceholders = [versionCodePrefix:"1915"]
+            targetSdkVersion 30
+            versionCode 1915 * 10000 + 462
+            versionName "4.40"
         }
         phoneTabletPost23 {
             dimension "devicetype"
             minSdkVersion 23
-            targetSdkVersion 29
-            manifestPlaceholders = [versionCodePrefix:"2315"]
+            targetSdkVersion 30
+            versionCode 2315 * 10000 + 462
+            versionName "4.40"
         }
         wearOs {
             dimension "devicetype"
             minSdkVersion 25    // 25 for Wear2.0 (23 would suffice for Wear1.0)
-            targetSdkVersion 29
-            manifestPlaceholders = [versionCodePrefix:"2501"]
+            targetSdkVersion 30
+            versionCode 2501 * 10000 + 462
+            versionName "4.40"
         }
     }
     buildTypes {
@@ -164,8 +169,8 @@ dependencies {
 
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
 
-  //implementation 'androidx.legacy:legacy-support-v4:1.0.0'   // v4 not required for building
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+//    implementation 'androidx.legacy:legacy-support-v4:1.0.0'   // v4 not required for building
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     // not required for building, BUT required for runtime when using newer gradle (20191022)
 
   //implementation 'androidx.legacy:legacy-support-v13:1.0.0'
@@ -193,9 +198,9 @@ dependencies {
     phoneTabletPost23Implementation   'com.google.android.support:wearable:2.8.1'
     wearOsImplementation              'com.google.android.support:wearable:2.8.1'
 
-    phoneTabletPre22Implementation    'com.google.android.wearable:wearable:2.8.1'
-    phoneTabletPost23Implementation   'com.google.android.wearable:wearable:2.8.1'
-    wearOsImplementation              'com.google.android.wearable:wearable:2.8.1'
+    phoneTabletPre22CompileOnly    'com.google.android.wearable:wearable:2.8.1'
+    phoneTabletPost23CompileOnly   'com.google.android.wearable:wearable:2.8.1'
+    wearOsCompileOnly              'com.google.android.wearable:wearable:2.8.1'
 
     //wearApp project(':wear:base') // applies to all other variants
 }