Merge pull request #390 from dropbox/jfein/fix-config-cache

Update stone generation to support config cache

.github/workflows/ci-examples.yml

@@ -24,9 +24,9 @@ jobs:
         distribution: 'zulu'
     - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
-        python-version: '2.7'
+        python-version: '3.9.10'
     - run: python -m pip install ply && pip install six
     - name: Grant execute permissions
       run: chmod +x gradlew && chmod +x update-submodules

.github/workflows/ci-tests.yml

@@ -24,9 +24,9 @@ jobs:
         distribution: 'zulu'
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
-        python-version: '2.7'
+        python-version: '3.9.10'
     - run: python -m pip install ply && pip install six
 
     - name: Grant execute permissions

build.gradle

@@ -64,7 +64,7 @@ configurations {
     withoutOsgi.extendsFrom api
 }
 
-processResources {
+processResources { task ->
     filesMatching('**/*.crt') { fcd ->
         def inputstream = fcd.open()
         def certDatas = com.dropbox.maven.pem_converter.PemLoader.load(
@@ -74,7 +74,7 @@ processResources {
 
         def crtPath = fcd.getPath()
         def rawPath = crtPath.substring(0, crtPath.length() - 4) + ".raw"
-        def rawFile = new File(getDestinationDir(), rawPath);
+        def rawFile = new File(task.getDestinationDir(), rawPath);
         rawFile.getParentFile().mkdirs();
         def out = new DataOutputStream(new FileOutputStream(rawFile))
         com.dropbox.maven.pem_converter.RawLoader.store(certDatas, out)
@@ -206,7 +206,9 @@ jar {
                 '*'
 
         def noeeProp = 'osgi.bnd.noee'
-        def noee = project.properties.get(noeeProp, System.properties.get(noeeProp, 'false'))
+        def noee = providers.gradleProperty(noeeProp).forUseAtConfigurationTime().getOrElse(
+                providers.systemProperty(noeeProp).forUseAtConfigurationTime().getOrElse('false')
+        )
         instruction '-noee', noee
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip